diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractBasePage.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractBasePage.java index 84f8fe81c5..0cccc9d37e 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractBasePage.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractBasePage.java @@ -30,6 +30,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.Random; +import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; @Slf4j @@ -42,7 +43,7 @@ abstract public class AbstractBasePage { public AbstractBasePage(WebDriver driver) { this.driver = driver; - this.wait = new WebDriverWait(driver, Duration.ofMillis(5000)); + this.wait = new WebDriverWait(driver, Duration.ofMillis(8000)); this.actions = new Actions(driver); this.js = (JavascriptExecutor) driver; } @@ -173,6 +174,15 @@ abstract public class AbstractBasePage { return random.toString(); } + public static String randomUUID() { + UUID randomUUID = UUID.randomUUID(); + return randomUUID.toString().replaceAll("_", ""); + } + + public static String random() { + return getRandomNumber() + randomUUID().substring(0, 6); + } + public static char getRandomSymbol() { Random rand = new Random(); String s = "~`!@#$^&*()_+=-"; diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/AssetProfileEditMenuTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/AssetProfileEditMenuTest.java index 061b09788b..2527e1a28c 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/AssetProfileEditMenuTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/AssetProfileEditMenuTest.java @@ -29,6 +29,7 @@ import org.thingsboard.server.msa.ui.utils.DataProviderCredential; import org.thingsboard.server.msa.ui.utils.EntityPrototypes; import static org.thingsboard.server.msa.ui.base.AbstractBasePage.getRandomNumber; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.EMPTY_ASSET_PROFILE_MESSAGE; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; @@ -56,7 +57,7 @@ public class AssetProfileEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void changeName() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); String newName = "Changed" + getRandomNumber(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name)); this.name = name; @@ -79,7 +80,7 @@ public class AssetProfileEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void deleteName() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name)); this.name = name; @@ -94,7 +95,7 @@ public class AssetProfileEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void saveWithOnlySpaceInName() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name)); this.name = name; @@ -112,7 +113,7 @@ public class AssetProfileEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke", dataProviderClass = DataProviderCredential.class, dataProvider = "editMenuDescription") @Description public void editDescription(String description, String newDescription, String finalDescription) { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name, description)); this.name = name; diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileTest.java index 764f21b7d5..2fbce0ecf2 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/CreateAssetProfileTest.java @@ -26,6 +26,7 @@ import org.thingsboard.server.msa.ui.pages.ProfilesPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewHelper; import org.thingsboard.server.msa.ui.utils.EntityPrototypes; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.EMPTY_ASSET_PROFILE_MESSAGE; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.Const.SAME_NAME_WARNING_ASSET_PROFILE_MESSAGE; @@ -54,7 +55,7 @@ public class CreateAssetProfileTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void createAssetProfile() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); sideBarMenuView.openAssetProfiles(); profilesPage.openCreateAssetProfileView(); @@ -70,7 +71,7 @@ public class CreateAssetProfileTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void createAssetProfileWithDetails() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); String ruleChain = "Root Rule Chain"; String mobileDashboard = "Firmware"; String queue = "Main"; @@ -105,7 +106,7 @@ public class CreateAssetProfileTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void createAssetProfileWithSameName() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name)); this.name = name; @@ -148,7 +149,7 @@ public class CreateAssetProfileTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void createAssetProfileWithoutRefresh() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); sideBarMenuView.openAssetProfiles(); profilesPage.openCreateAssetProfileView(); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteAssetProfileTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteAssetProfileTest.java index 100f0664ea..d998f9d235 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteAssetProfileTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteAssetProfileTest.java @@ -25,6 +25,7 @@ import org.thingsboard.server.msa.ui.pages.ProfilesPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewHelper; import org.thingsboard.server.msa.ui.utils.EntityPrototypes; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; public class DeleteAssetProfileTest extends AbstractDriverBaseTest { @@ -42,7 +43,7 @@ public class DeleteAssetProfileTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void removeAssetProfile() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name)); sideBarMenuView.openAssetProfiles(); @@ -56,7 +57,7 @@ public class DeleteAssetProfileTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void removeAssetProfileFromView() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name)); sideBarMenuView.openAssetProfiles(); @@ -71,7 +72,7 @@ public class DeleteAssetProfileTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void removeSelectedAssetProfile() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name)); sideBarMenuView.openAssetProfiles(); @@ -112,7 +113,7 @@ public class DeleteAssetProfileTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void removeAssetProfileWithoutRefresh() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name)); sideBarMenuView.openAssetProfiles(); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteSeveralAssetProfilesTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteSeveralAssetProfilesTest.java index af5bcbd490..8b937c5106 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteSeveralAssetProfilesTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/DeleteSeveralAssetProfilesTest.java @@ -25,6 +25,7 @@ import org.thingsboard.server.msa.ui.pages.ProfilesPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewHelper; import org.thingsboard.server.msa.ui.utils.EntityPrototypes; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; public class DeleteSeveralAssetProfilesTest extends AbstractDriverBaseTest { @@ -41,8 +42,8 @@ public class DeleteSeveralAssetProfilesTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void canDeleteSeveralAssetProfilesByTopBtn() { - String name1 = ENTITY_NAME + "1"; - String name2 = ENTITY_NAME + "2"; + String name1 = ENTITY_NAME + random() + "1"; + String name2 = ENTITY_NAME + random() + "2"; testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name1)); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name2)); @@ -59,8 +60,8 @@ public class DeleteSeveralAssetProfilesTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void selectAllDAssetProfiles() { - String name1 = ENTITY_NAME + "1"; - String name2 = ENTITY_NAME + "2"; + String name1 = ENTITY_NAME + random() + "1"; + String name2 = ENTITY_NAME + random() +"2"; testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name1)); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name2)); @@ -87,8 +88,8 @@ public class DeleteSeveralAssetProfilesTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void deleteSeveralAssetProfilesByTopBtnWithoutRefresh() { - String name1 = ENTITY_NAME + "1"; - String name2 = ENTITY_NAME + "2"; + String name1 = ENTITY_NAME + random() + "1"; + String name2 = ENTITY_NAME + random() + "2"; testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name1)); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name2)); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/MakeAssetProfileDefaultTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/MakeAssetProfileDefaultTest.java index 7fd637f75e..b3b82cfbf2 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/MakeAssetProfileDefaultTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assetProfileSmoke/MakeAssetProfileDefaultTest.java @@ -26,6 +26,7 @@ import org.thingsboard.server.msa.ui.pages.ProfilesPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewHelper; import org.thingsboard.server.msa.ui.utils.EntityPrototypes; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; public class MakeAssetProfileDefaultTest extends AbstractDriverBaseTest { @@ -49,7 +50,7 @@ public class MakeAssetProfileDefaultTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void makeDeviceProfileDefaultByRightCornerBtn() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name)); this.name = name; @@ -63,7 +64,7 @@ public class MakeAssetProfileDefaultTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void makeDeviceProfileDefaultFromView() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postAssetProfile(EntityPrototypes.defaultAssetProfile(name)); this.name = name; diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CreateCustomerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CreateCustomerTest.java index cc356a6e48..f2a2933a8e 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CreateCustomerTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CreateCustomerTest.java @@ -26,6 +26,7 @@ import org.thingsboard.server.msa.ui.pages.CustomerPageHelper; import org.thingsboard.server.msa.ui.pages.LoginPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewElements; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.EMPTY_CUSTOMER_MESSAGE; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.Const.SAME_NAME_WARNING_CUSTOMER_MESSAGE; @@ -54,7 +55,7 @@ public class CreateCustomerTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void createCustomer() { - String customerName = ENTITY_NAME; + String customerName = ENTITY_NAME + random(); sideBarMenuView.customerBtn().click(); customerPage.plusBtn().click(); @@ -70,7 +71,7 @@ public class CreateCustomerTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void createCustomerWithFullInformation() { - String customerName = ENTITY_NAME; + String customerName = ENTITY_NAME + random(); String text = "Text"; String email = "email@mail.com"; String number = "12015550123"; @@ -155,7 +156,7 @@ public class CreateCustomerTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void createCustomerWithoutRefresh() { - String customerName = ENTITY_NAME; + String customerName = ENTITY_NAME + random(); sideBarMenuView.customerBtn().click(); customerPage.plusBtn().click(); 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 5917c79c74..d2c82fb9ab 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 @@ -29,6 +29,7 @@ import org.thingsboard.server.msa.ui.utils.DataProviderCredential; import org.thingsboard.server.msa.ui.utils.EntityPrototypes; import static org.thingsboard.server.msa.ui.base.AbstractBasePage.getRandomNumber; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.EMPTY_CUSTOMER_MESSAGE; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.Const.PHONE_NUMBER_ERROR_MESSAGE; @@ -61,7 +62,7 @@ public class CustomerEditMenuTest extends AbstractDriverBaseTest { @Description public void changeTitle() { String customerName = "Changed" + getRandomNumber(); - testRestClient.postCustomer(defaultCustomerPrototype(ENTITY_NAME)); + testRestClient.postCustomer(defaultCustomerPrototype(ENTITY_NAME + random())); this.customerName = customerName; sideBarMenuView.customerBtn().click(); @@ -109,7 +110,7 @@ public class CustomerEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke", dataProviderClass = DataProviderCredential.class, dataProvider = "editMenuDescription") @Description public void editDescription(String description, String newDescription, String finalDescription) { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postCustomer(EntityPrototypes.defaultCustomerPrototype(name, description)); customerName = name; @@ -126,7 +127,7 @@ public class CustomerEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void assignedDashboardFromDashboard() { - String customerName = ENTITY_NAME; + String customerName = ENTITY_NAME + random(); testRestClient.postCustomer(defaultCustomerPrototype(customerName)); this.customerName = customerName; @@ -153,7 +154,7 @@ public class CustomerEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void assignedDashboard() { - String customerName = ENTITY_NAME; + String customerName = ENTITY_NAME + random(); testRestClient.postCustomer(defaultCustomerPrototype(customerName)); this.customerName = customerName; @@ -179,7 +180,7 @@ public class CustomerEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void assignedDashboardWithoutHide() { - String customerName = ENTITY_NAME; + String customerName = ENTITY_NAME + random(); testRestClient.postCustomer(defaultCustomerPrototype(customerName)); this.customerName = customerName; @@ -212,7 +213,7 @@ public class CustomerEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void addPhoneNumber() { - String customerName = ENTITY_NAME; + String customerName = ENTITY_NAME + random(); testRestClient.postCustomer(defaultCustomerPrototype(customerName)); this.customerName = customerName; String number = "2015550123"; @@ -245,7 +246,7 @@ public class CustomerEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void addAllInformation() { - String customerName = ENTITY_NAME; + String customerName = ENTITY_NAME + random(); testRestClient.postCustomer(defaultCustomerPrototype(customerName)); this.customerName = customerName; String text = "Text"; 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 0b1854ecf7..a80b643f00 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 @@ -25,6 +25,7 @@ import org.thingsboard.server.msa.ui.pages.LoginPageHelper; import org.thingsboard.server.msa.ui.pages.RuleChainsPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewElements; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultCustomerPrototype; @@ -45,7 +46,7 @@ public class DeleteCustomerTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void removeCustomerByRightSideBtn() { - String customer = ENTITY_NAME; + String customer = ENTITY_NAME + random(); testRestClient.postCustomer(defaultCustomerPrototype(customer)); sideBarMenuView.customerBtn().click(); @@ -58,7 +59,7 @@ public class DeleteCustomerTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void removeSelectedCustomer() { - String customerName = ENTITY_NAME; + String customerName = ENTITY_NAME + random(); testRestClient.postCustomer(defaultCustomerPrototype(customerName)); sideBarMenuView.customerBtn().click(); @@ -71,7 +72,7 @@ public class DeleteCustomerTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void removeFromCustomerView() { - String customerName = ENTITY_NAME; + String customerName = ENTITY_NAME + random(); testRestClient.postCustomer(defaultCustomerPrototype(customerName)); sideBarMenuView.customerBtn().click(); @@ -86,7 +87,7 @@ public class DeleteCustomerTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void removeCustomerByRightSideBtnWithoutRefresh() { - String customer = ENTITY_NAME; + String customer = ENTITY_NAME + random(); testRestClient.postCustomer(defaultCustomerPrototype(customer)); sideBarMenuView.customerBtn().click(); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteSeveralCustomerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteSeveralCustomerTest.java index 33375d516f..7e3ea7ad76 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteSeveralCustomerTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteSeveralCustomerTest.java @@ -24,6 +24,7 @@ import org.thingsboard.server.msa.ui.pages.CustomerPageHelper; import org.thingsboard.server.msa.ui.pages.LoginPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewElements; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultCustomerPrototype; @@ -42,8 +43,8 @@ public class DeleteSeveralCustomerTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void canDeleteSeveralCustomersByTopBtn() { - String title1 = ENTITY_NAME + "1"; - String title2 = ENTITY_NAME + "2"; + String title1 = ENTITY_NAME + random() + "1"; + String title2 = ENTITY_NAME + random() + "2"; testRestClient.postCustomer(defaultCustomerPrototype(title1)); testRestClient.postCustomer(defaultCustomerPrototype(title2)); @@ -72,8 +73,8 @@ public class DeleteSeveralCustomerTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void deleteSeveralCustomersByTopBtnWithoutRefresh() { - String title1 = ENTITY_NAME + "1"; - String title2 = ENTITY_NAME + "2"; + String title1 = ENTITY_NAME + random() + "1"; + String title2 = ENTITY_NAME + random() + "2"; testRestClient.postCustomer(defaultCustomerPrototype(title1)); testRestClient.postCustomer(defaultCustomerPrototype(title2)); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileTest.java index e6690729a1..02d41a61b8 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/CreateDeviceProfileTest.java @@ -27,6 +27,7 @@ import org.thingsboard.server.msa.ui.pages.ProfilesPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewHelper; import org.thingsboard.server.msa.ui.utils.EntityPrototypes; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.EMPTY_DEVICE_PROFILE_MESSAGE; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.Const.NAME_IS_REQUIRED_MESSAGE; @@ -56,7 +57,7 @@ public class CreateDeviceProfileTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void createDeviceProfile() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); sideBarMenuView.openDeviceProfiles(); profilesPage.openCreateDeviceProfileView(); @@ -72,7 +73,7 @@ public class CreateDeviceProfileTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void createDeviceProfileWithDetails() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); String ruleChain = "Root Rule Chain"; String mobileDashboard = "Firmware"; String queue = "Main"; @@ -107,7 +108,7 @@ public class CreateDeviceProfileTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void createDeviseProfileWithSameName() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postDeviceProfile(EntityPrototypes.defaultDeviceProfile(name)); this.name = name; @@ -154,7 +155,7 @@ public class CreateDeviceProfileTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void createDeviceProfileWithoutRefresh() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); sideBarMenuView.openDeviceProfiles(); profilesPage.openCreateDeviceProfileView(); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteDeviceProfileTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteDeviceProfileTest.java index 6ccb23aaf3..283796d48e 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteDeviceProfileTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteDeviceProfileTest.java @@ -25,6 +25,7 @@ import org.thingsboard.server.msa.ui.pages.ProfilesPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewHelper; import org.thingsboard.server.msa.ui.utils.EntityPrototypes; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; public class DeleteDeviceProfileTest extends AbstractDriverBaseTest { @@ -42,7 +43,7 @@ public class DeleteDeviceProfileTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void removeDeviceProfile() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postDeviceProfile(EntityPrototypes.defaultDeviceProfile(name)); sideBarMenuView.openDeviceProfiles(); @@ -56,7 +57,7 @@ public class DeleteDeviceProfileTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void removeDeviceProfileFromView() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postDeviceProfile(EntityPrototypes.defaultDeviceProfile(name)); sideBarMenuView.openDeviceProfiles(); @@ -71,7 +72,7 @@ public class DeleteDeviceProfileTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void removeSelectedDeviceProfile() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postDeviceProfile(EntityPrototypes.defaultDeviceProfile(name)); sideBarMenuView.openDeviceProfiles(); @@ -112,7 +113,7 @@ public class DeleteDeviceProfileTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void removeDeviceProfileWithoutRefresh() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postDeviceProfile(EntityPrototypes.defaultDeviceProfile(name)); sideBarMenuView.openDeviceProfiles(); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteSeveralDeviceProfilesTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteSeveralDeviceProfilesTest.java index 71169cfa7e..a5ee858903 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteSeveralDeviceProfilesTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeleteSeveralDeviceProfilesTest.java @@ -24,6 +24,7 @@ import org.thingsboard.server.msa.ui.pages.LoginPageHelper; import org.thingsboard.server.msa.ui.pages.ProfilesPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewHelper; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultDeviceProfile; @@ -41,8 +42,8 @@ public class DeleteSeveralDeviceProfilesTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void canDeleteSeveralDeviceProfilesByTopBtn() { - String name1 = ENTITY_NAME + "1"; - String name2 = ENTITY_NAME + "2"; + String name1 = ENTITY_NAME + random() + "1"; + String name2 = ENTITY_NAME + random() + "2"; testRestClient.postDeviceProfile(defaultDeviceProfile(name1)); testRestClient.postDeviceProfile(defaultDeviceProfile(name2)); @@ -81,8 +82,8 @@ public class DeleteSeveralDeviceProfilesTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void deleteSeveralDeviceProfilesByTopBtnWithoutRefresh() { - String name1 = ENTITY_NAME + "1"; - String name2 = ENTITY_NAME + "2"; + String name1 = ENTITY_NAME + random() + "1"; + String name2 = ENTITY_NAME + random() + "2"; testRestClient.postDeviceProfile(defaultDeviceProfile(name1)); testRestClient.postDeviceProfile(defaultDeviceProfile(name2)); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeviceProfileEditMenuTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeviceProfileEditMenuTest.java index fa1d5e3608..eb8cba6d8d 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeviceProfileEditMenuTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/deviceProfileSmoke/DeviceProfileEditMenuTest.java @@ -29,6 +29,7 @@ import org.thingsboard.server.msa.ui.utils.DataProviderCredential; import org.thingsboard.server.msa.ui.utils.EntityPrototypes; import static org.thingsboard.server.msa.ui.base.AbstractBasePage.getRandomNumber; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.EMPTY_DEVICE_PROFILE_MESSAGE; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; @@ -56,7 +57,7 @@ public class DeviceProfileEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void changeName() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); String newName = "Changed" + getRandomNumber(); testRestClient.postDeviceProfile(EntityPrototypes.defaultDeviceProfile(name)); this.name = name; @@ -79,7 +80,7 @@ public class DeviceProfileEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void deleteName() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postDeviceProfile(EntityPrototypes.defaultDeviceProfile(name)); this.name = name; @@ -94,7 +95,7 @@ public class DeviceProfileEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void saveWithOnlySpaceInName() { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postDeviceProfile(EntityPrototypes.defaultDeviceProfile(name)); this.name = name; @@ -112,7 +113,7 @@ public class DeviceProfileEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke", dataProviderClass = DataProviderCredential.class, dataProvider = "editMenuDescription") @Description public void editDescription(String description, String newDescription, String finalDescription) { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postDeviceProfile(EntityPrototypes.defaultDeviceProfile(name, description)); this.name = name; diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java index f3d27a5eba..2daabdb012 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java @@ -28,6 +28,7 @@ import org.thingsboard.server.msa.ui.utils.EntityPrototypes; import java.util.ArrayList; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.EMPTY_RULE_CHAIN_MESSAGE; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; @@ -55,7 +56,7 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void createRuleChain() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); sideBarMenuView.ruleChainsBtn().click(); ruleChainsPage.openCreateRuleChainView(); @@ -72,16 +73,16 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void createRuleChainWithDescription() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); sideBarMenuView.ruleChainsBtn().click(); ruleChainsPage.openCreateRuleChainView(); ruleChainsPage.nameField().sendKeys(ruleChainName); - ruleChainsPage.descriptionAddEntityView().sendKeys(ENTITY_NAME); + ruleChainsPage.descriptionAddEntityView().sendKeys(ruleChainName); ruleChainsPage.addBtnC().click(); ruleChainsPage.refreshBtn().click(); this.ruleChainName = ruleChainName; - ruleChainsPage.detailsBtn(ENTITY_NAME).click(); + ruleChainsPage.detailsBtn(ruleChainName).click(); ruleChainsPage.setHeaderName(); Assert.assertEquals(ruleChainsPage.getHeaderName(), ruleChainName); @@ -115,7 +116,7 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void createRuleChainWithSameName() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(EntityPrototypes.defaultRuleChainPrototype(ruleChainName)); this.ruleChainName = ruleChainName; @@ -140,7 +141,7 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void createRuleChainWithoutRefresh() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); sideBarMenuView.ruleChainsBtn().click(); ruleChainsPage.openCreateRuleChainView(); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java index a3a318f060..698b28b3e3 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java @@ -24,6 +24,7 @@ import org.thingsboard.server.msa.ui.pages.LoginPageHelper; import org.thingsboard.server.msa.ui.pages.RuleChainsPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewElements; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.DELETE_RULE_CHAIN_WITH_PROFILE_MESSAGE; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.Const.ROOT_RULE_CHAIN_NAME; @@ -43,7 +44,7 @@ public class DeleteRuleChainTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void removeRuleChainByRightSideBtn() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); sideBarMenuView.ruleChainsBtn().click(); @@ -56,7 +57,7 @@ public class DeleteRuleChainTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void removeSelectedRuleChain() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); sideBarMenuView.ruleChainsBtn().click(); @@ -69,7 +70,7 @@ public class DeleteRuleChainTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void removeFromRuleChainView() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); sideBarMenuView.ruleChainsBtn().click(); @@ -156,7 +157,7 @@ public class DeleteRuleChainTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void removeRuleChainByRightSideBtnWithoutRefresh() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); sideBarMenuView.ruleChainsBtn().click(); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteSeveralRuleChainsTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteSeveralRuleChainsTest.java index 9ab089d0f3..c37cf2d5ec 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteSeveralRuleChainsTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteSeveralRuleChainsTest.java @@ -24,6 +24,7 @@ import org.thingsboard.server.msa.ui.pages.LoginPageHelper; import org.thingsboard.server.msa.ui.pages.RuleChainsPageHelper; import org.thingsboard.server.msa.ui.pages.SideBarMenuViewElements; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.Const.ROOT_RULE_CHAIN_NAME; import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultRuleChainPrototype; @@ -43,7 +44,7 @@ public class DeleteSeveralRuleChainsTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void canDeleteSeveralRuleChainsByTopBtn() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName + 1)); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); @@ -59,7 +60,7 @@ public class DeleteSeveralRuleChainsTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void selectAllRuleChain() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName + 1)); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); @@ -93,7 +94,7 @@ public class DeleteSeveralRuleChainsTest extends AbstractDriverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void deleteSeveralRuleChainsByTopBtnWithoutRefresh() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName + 1)); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); 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 ce17b5517d..70609242e1 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 @@ -27,6 +27,7 @@ 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.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; public class OpenRuleChainTest extends AbstractDriverBaseTest { @@ -55,8 +56,8 @@ public class OpenRuleChainTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void openRuleChainByRightCornerBtn() { - String ruleChainName = ENTITY_NAME; - testRestClient.postRuleChain(EntityPrototypes.defaultRuleChainPrototype(ENTITY_NAME)); + String ruleChainName = ENTITY_NAME + random(); + testRestClient.postRuleChain(EntityPrototypes.defaultRuleChainPrototype(ruleChainName)); this.ruleChainName = ruleChainName; sideBarMenuView.ruleChainsBtn().click(); @@ -72,7 +73,7 @@ public class OpenRuleChainTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void openRuleChainByViewBtn() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(EntityPrototypes.defaultRuleChainPrototype(ruleChainName)); this.ruleChainName = ruleChainName; diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java index 48e1c87927..045a006837 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java @@ -27,6 +27,8 @@ import org.thingsboard.server.msa.ui.pages.SideBarMenuViewElements; import org.thingsboard.server.msa.ui.utils.DataProviderCredential; import org.thingsboard.server.msa.ui.utils.EntityPrototypes; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.getRandomNumber; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.EMPTY_RULE_CHAIN_MESSAGE; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultRuleChainPrototype; @@ -55,8 +57,8 @@ public class RuleChainEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 10, groups = "smoke") @Description public void changeName() { - String newRuleChainName = "Changed"; - String ruleChainName = ENTITY_NAME; + String newRuleChainName = "Changed" + getRandomNumber(); + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); this.ruleChainName = ruleChainName; @@ -78,7 +80,7 @@ public class RuleChainEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void deleteName() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); this.ruleChainName = ruleChainName; @@ -93,7 +95,7 @@ public class RuleChainEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void saveOnlyWithSpace() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME +random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); this.ruleChainName = ruleChainName; @@ -111,7 +113,7 @@ public class RuleChainEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke", dataProviderClass = DataProviderCredential.class, dataProvider = "editMenuDescription") @Description public void editDescription(String description, String newDescription, String finalDescription) { - String name = ENTITY_NAME; + String name = ENTITY_NAME + random(); testRestClient.postRuleChain(EntityPrototypes.defaultRuleChainPrototype(name, description)); ruleChainName = name; @@ -128,7 +130,7 @@ public class RuleChainEditMenuTest extends AbstractDriverBaseTest { @Test(priority = 20, groups = "smoke") @Description public void debugMode() { - String ruleChainName = ENTITY_NAME; + String ruleChainName = ENTITY_NAME + random(); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); this.ruleChainName = ruleChainName; diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/Const.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/Const.java index eb4cd14771..fa9e7b8ab1 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/Const.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/Const.java @@ -23,7 +23,7 @@ public class Const { public static final String URL = getBaseUrl(); public static final String TENANT_EMAIL = "tenant@thingsboard.org"; public static final String TENANT_PASSWORD = "tenant"; - public static final String ENTITY_NAME = "Az!@#$%^&*()_-+=~`" + getRandomNumber(); + public static final String ENTITY_NAME = "Az!@#$%^&*()_-+=~`"; public static final String ROOT_RULE_CHAIN_NAME = "Root Rule Chain"; public static final String IMPORT_RULE_CHAIN_NAME = "Rule Chain For Import"; public static final String IMPORT_DEVICE_PROFILE_NAME = "Device Profile For Import"; diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/DataProviderCredential.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/DataProviderCredential.java index 005e708e58..22830966ec 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/DataProviderCredential.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/DataProviderCredential.java @@ -20,12 +20,13 @@ import org.testng.annotations.DataProvider; import static org.thingsboard.server.msa.ui.base.AbstractBasePage.getRandomNumber; import static org.thingsboard.server.msa.ui.base.AbstractBasePage.getRandomSymbol; +import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; public class DataProviderCredential { - private static final String SYMBOL = String.valueOf(getRandomSymbol()); private static final String NAME = ENTITY_NAME; + private static final String SYMBOL = String.valueOf(getRandomSymbol()); private static final String NUMBER = "1"; private static final String LONG_PHONE_NUMBER = "20155501231"; private static final String SHORT_PHONE_NUMBER = "201555011"; @@ -45,28 +46,29 @@ public class DataProviderCredential { @DataProvider public static Object[][] nameForSearchBySymbolAndNumber() { + String name = ENTITY_NAME + random(); return new Object[][]{ - {NAME, ENTITY_NAME.split("`")[1]}, - {NAME, "~"}, - {NAME, "`"}, - {NAME, "!"}, - {NAME, "@"}, - {NAME, "#"}, - {NAME, "$"}, - {NAME, "^"}, - {NAME, "&"}, - {NAME, "*"}, - {NAME, "("}, - {NAME, ")"}, - {NAME, "+"}, - {NAME, "="}, - {NAME, "-"}}; + {name, name.split("`")[1]}, + {NAME + getRandomNumber(), "~"}, + {NAME + getRandomNumber(), "`"}, + {NAME + getRandomNumber(), "!"}, + {NAME + getRandomNumber(), "@"}, + {NAME + getRandomNumber(), "#"}, + {NAME + getRandomNumber(), "$"}, + {NAME + getRandomNumber(), "^"}, + {NAME + getRandomNumber(), "&"}, + {NAME + getRandomNumber(), "*"}, + {NAME + getRandomNumber(), "("}, + {NAME + getRandomNumber(), ")"}, + {NAME + getRandomNumber(), "+"}, + {NAME + getRandomNumber(), "="}, + {NAME + getRandomNumber(), "-"}}; } @DataProvider public static Object[][] nameForSort() { return new Object[][]{ - {NAME}, + {NAME + getRandomNumber()}, {SYMBOL}, {NUMBER}}; } @@ -74,7 +76,7 @@ public class DataProviderCredential { @DataProvider public static Object[][] nameForAllSort() { return new Object[][]{ - {NAME, SYMBOL, NUMBER}}; + {NAME + getRandomNumber(), SYMBOL, NUMBER}}; } @DataProvider @@ -82,7 +84,7 @@ public class DataProviderCredential { return new Object[][]{ {LONG_PHONE_NUMBER}, {SHORT_PHONE_NUMBER}, - {ENTITY_NAME}}; + {ENTITY_NAME + getRandomNumber()}}; } @DataProvider @@ -94,46 +96,48 @@ public class DataProviderCredential { @DataProvider public static Object[][] deviceProfileSearch() { + String name = NAME + getRandomNumber(); return new Object[][]{ {DEFAULT_DEVICE_PROFILE_NAME, DEFAULT_DEVICE_PROFILE_NAME.split(" ")[0]}, {DEFAULT_DEVICE_PROFILE_NAME, DEFAULT_DEVICE_PROFILE_NAME.split(" ")[1]}, - {NAME, ENTITY_NAME.split("`")[1]}, - {NAME, "~"}, - {NAME, "`"}, - {NAME, "!"}, - {NAME, "@"}, - {NAME, "#"}, - {NAME, "$"}, - {NAME, "^"}, - {NAME, "&"}, - {NAME, "*"}, - {NAME, "("}, - {NAME, ")"}, - {NAME, "+"}, - {NAME, "="}, - {NAME, "-"}}; + {name, name.split("`")[1]}, + {NAME + getRandomNumber(), "~"}, + {NAME + getRandomNumber(), "`"}, + {NAME + getRandomNumber(), "!"}, + {NAME + getRandomNumber(), "@"}, + {NAME + getRandomNumber(), "#"}, + {NAME + getRandomNumber(), "$"}, + {NAME + getRandomNumber(), "^"}, + {NAME + getRandomNumber(), "&"}, + {NAME + getRandomNumber(), "*"}, + {NAME + getRandomNumber(), "("}, + {NAME + getRandomNumber(), ")"}, + {NAME + getRandomNumber(), "+"}, + {NAME + getRandomNumber(), "="}, + {NAME + getRandomNumber(), "-"}}; } @DataProvider public static Object[][] assetProfileSearch() { + String name = NAME + getRandomNumber(); return new Object[][]{ {DEFAULT_ASSET_PROFILE_NAME, DEFAULT_ASSET_PROFILE_NAME.split(" ")[0]}, {DEFAULT_ASSET_PROFILE_NAME, DEFAULT_ASSET_PROFILE_NAME.split(" ")[1]}, - {NAME, ENTITY_NAME.split("`")[1]}, - {NAME, "~"}, - {NAME, "`"}, - {NAME, "!"}, - {NAME, "@"}, - {NAME, "#"}, - {NAME, "$"}, - {NAME, "^"}, - {NAME, "&"}, - {NAME, "*"}, - {NAME, "("}, - {NAME, ")"}, - {NAME, "+"}, - {NAME, "="}, - {NAME, "-"}}; + {name, name.split("`")[1]}, + {NAME + getRandomNumber(), "~"}, + {NAME + getRandomNumber(), "`"}, + {NAME + getRandomNumber(), "!"}, + {NAME + getRandomNumber(), "@"}, + {NAME + getRandomNumber(), "#"}, + {NAME + getRandomNumber(), "$"}, + {NAME + getRandomNumber(), "^"}, + {NAME + getRandomNumber(), "&"}, + {NAME + getRandomNumber(), "*"}, + {NAME + getRandomNumber(), "("}, + {NAME + getRandomNumber(), ")"}, + {NAME + getRandomNumber(), "+"}, + {NAME + getRandomNumber(), "="}, + {NAME + getRandomNumber(), "-"}}; } @DataProvider