From 7116491824ef0b96d4dc47e59a7e22dd45904d44 Mon Sep 17 00:00:00 2001 From: Seraphym-Tuhai Date: Wed, 31 May 2023 23:29:00 +0300 Subject: [PATCH] fix ui tests, add alarm assignee tests to suite --- .../server/msa/ui/base/AbstractBasePage.java | 29 +++++++++++++++++-- .../msa/ui/base/AbstractDriverBaseTest.java | 9 ++---- .../pages/AlarmDetailsEntityTabElements.java | 5 ++++ .../msa/ui/pages/CustomerPageHelper.java | 17 +++++++++++ .../msa/ui/pages/DashboardPageElements.java | 15 ++++------ .../msa/ui/pages/DashboardPageHelper.java | 1 - .../AbstractAssignTest.java | 2 +- .../AssignDetailsTabAssignTest.java | 8 ++--- ...ssignDetailsTabFromCustomerAssignTest.java | 2 +- .../AssignFromAlarmWidgetTest.java | 10 +++---- .../customerSmoke/CreateCustomerTest.java | 6 ++-- .../customerSmoke/CustomerEditMenuTest.java | 13 +++++---- .../tests/devicessmoke/DeviceFilterTest.java | 4 +-- .../{assignee.xml => alarmAssignee.xml} | 4 +-- .../src/test/resources/all.xml | 10 +++++++ .../src/test/resources/uiTests.xml | 10 +++++++ 16 files changed, 99 insertions(+), 46 deletions(-) rename msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/{assignee => alarmassignee}/AbstractAssignTest.java (98%) rename msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/{assignee => alarmassignee}/AssignDetailsTabAssignTest.java (97%) rename msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/{assignee => alarmassignee}/AssignDetailsTabFromCustomerAssignTest.java (99%) rename msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/{assignee => alarmassignee}/AssignFromAlarmWidgetTest.java (93%) rename msa/black-box-tests/src/test/resources/{assignee.xml => alarmAssignee.xml} (95%) 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 cfb282b88c..57852fa58e 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 @@ -18,6 +18,7 @@ package org.thingsboard.server.msa.ui.base; import lombok.SneakyThrows; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; +import org.openqa.selenium.Keys; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebDriverException; import org.openqa.selenium.WebElement; @@ -42,7 +43,6 @@ abstract public class AbstractBasePage { protected Actions actions; protected JavascriptExecutor js; - public AbstractBasePage(WebDriver driver) { this.driver = driver; this.wait = new WebDriverWait(driver, Duration.ofMillis(WAIT_TIMEOUT)); @@ -154,7 +154,11 @@ abstract public class AbstractBasePage { } public void waitUntilAttributeContains(WebElement element, String attribute, String value) { - wait.until(ExpectedConditions.attributeContains(element, attribute, value)); + try { + wait.until(ExpectedConditions.attributeContains(element, attribute, value)); + } catch (WebDriverException e) { + fail("Failed to wait until attribute '" + attribute + "' of element '" + element + "' contains value '" + value + "'"); + } } public void goToNextTab(int tabNumber) { @@ -189,4 +193,25 @@ abstract public class AbstractBasePage { public void pull(WebElement element, int xOffset, int yOffset) { actions.clickAndHold(element).moveByOffset(xOffset, yOffset).release().perform(); } + + public void waitUntilAttributeToBe(String locator, String attribute, String value) { + try { + wait.until(ExpectedConditions.attributeToBe(By.xpath(locator), attribute, value)); + } catch (WebDriverException e) { + fail("Failed to wait until attribute '" + attribute + "' of element located by '" + locator + "' is '" + value + "'"); + } + } + + public void clearInputField(WebElement element) { + element.click(); + element.sendKeys(Keys.CONTROL + "A" + Keys.BACK_SPACE); + } + + public void waitUntilAttributeToBeNotEmpty(WebElement element, String attribute) { + try { + wait.until(ExpectedConditions.attributeToBeNotEmpty(element, attribute)); + } catch (WebDriverException e) { + fail("Failed to wait until attribute '" + attribute + "' of element '" + element + "' is not empty"); + } + } } 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 ea1e669537..df3bc557bc 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 @@ -55,7 +55,6 @@ import java.io.ByteArrayInputStream; import java.net.MalformedURLException; import java.net.URL; import java.time.Duration; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -231,13 +230,9 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest { } } - public WebStorage getWebStorage() { - return webStorage = (WebStorage) driver; - } - public void clearStorage() { - getWebStorage().getLocalStorage().clear(); - getWebStorage().getSessionStorage().clear(); + getJs().executeScript("window.localStorage.clear();"); + getJs().executeScript("window.sessionStorage.clear();"); } public void deleteAlarmById(AlarmId alarmId) { diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/AlarmDetailsEntityTabElements.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/AlarmDetailsEntityTabElements.java index 65a8aeb1f1..a75df8c203 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/AlarmDetailsEntityTabElements.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/AlarmDetailsEntityTabElements.java @@ -35,6 +35,7 @@ public class AlarmDetailsEntityTabElements extends OtherPageElements { private static final String ALARM_DETAILS_BTN = "//span[text() = '%s']/ancestor::mat-row//mat-icon[contains(text(),'more_horiz')]/parent::button"; private static final String ACCESS_FORBIDDEN_DIALOG_VIEW = "//h2[text() = 'Access Forbidden']/parent::tb-confirm-dialog"; private static final String ALARM_ASSIGNEE_DROPDOWN = "//tb-alarm-assignee-panel"; + private static final String NO_USERS_FOUND_MESSAGE = "//div[@class='tb-not-found-content']/span"; public WebElement assignBtn(String type) { return waitUntilElementToBeClickable(String.format(ASSIGN_BTN, type)); @@ -75,4 +76,8 @@ public class AlarmDetailsEntityTabElements extends OtherPageElements { public WebElement alarmAssigneeDropdown() { return waitUntilVisibilityOfElementLocated(ALARM_ASSIGNEE_DROPDOWN); } + + public WebElement noUsersFoundMessage() { + return waitUntilVisibilityOfElementLocated(NO_USERS_FOUND_MESSAGE); + } } diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageHelper.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageHelper.java index ee89e5053d..245864eafa 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageHelper.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageHelper.java @@ -146,6 +146,14 @@ public class CustomerPageHelper extends CustomerPageElements { submitAssignedBtn().click(); } + public void assignedDashboard(String dashboardName) { + plusBtn().click(); + assignedField().click(); + entityFromList(dashboardName).click(); + assignedField().sendKeys(Keys.ESCAPE); + submitAssignedBtn().click(); + } + public boolean customerIsNotPresent(String title) { return elementsIsNotPresent(getEntity(title)); } @@ -169,4 +177,13 @@ public class CustomerPageHelper extends CustomerPageElements { } customerDetailsAlarmsBtn().click(); } + + public void disableHideHomeDashboardToolbar() { + hideHomeDashboardToolbarCheckbox().click(); + waitUntilAttributeToBe("//mat-checkbox[@formcontrolname='homeDashboardHideToolbar']//input", "class", "mdc-checkbox__native-control"); + } + + public void waitUntilDashboardFieldToBeNotEmpty() { + waitUntilAttributeToBeNotEmpty(editMenuDashboardField(), "value"); + } } diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DashboardPageElements.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DashboardPageElements.java index 8994b2e748..d3ac6db03e 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DashboardPageElements.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DashboardPageElements.java @@ -30,13 +30,12 @@ public class DashboardPageElements extends OtherPageElementsHelper { private static final String MANAGE_ASSIGNED_ENTITY_LIST_FIELD = "//input[@formcontrolname='entity']"; private static final String MANAGE_ASSIGNED_ENTITY = "//mat-option//span[contains(text(),'%s')]"; private static final String MANAGE_ASSIGNED_UPDATE_BTN = "//button[@type='submit']"; - private static final String EDIT_BTN = "//mat-icon[text() = 'edit']/parent::button"; - private static final String ADD_BTN = "//tb-footer-fab-buttons//button"; - private static final String CREAT_NEW_DASHBOARD_BTN = "//mat-icon[text() = 'insert_drive_file']/parent::button"; + private static final String EDIT_BTN = "//mat-icon[text() = 'edit']/parent::button[@mat-stroked-button]"; + private static final String ADD_BTN = "//mat-fab-actions//mat-icon[text() = 'add']/parent::button"; private static final String ALARM_WIDGET_BUNDLE = "//mat-card-title[text() = 'Alarm widgets']/ancestor::mat-card"; private static final String ALARM_TABLE_WIDGET = "//img[@alt='Alarms table']/ancestor::mat-card"; private static final String WIDGET_SE_CORNER = "//div[contains(@class,'handle-se')]"; - private static final String DONE_BTN = "//tb-footer-fab-buttons/following-sibling::button//mat-icon[text() = 'done']/parent::button"; + private static final String SAVE_BTN = "//mat-icon[text() = 'done']/parent::button[@fxhide.lt-lg]"; public List entityTitles() { return waitUntilVisibilityOfElementsLocated(TITLES); @@ -66,10 +65,6 @@ public class DashboardPageElements extends OtherPageElementsHelper { return waitUntilElementToBeClickable(ADD_BTN); } - public WebElement createNewDashboardBtn() { - return waitUntilElementToBeClickable(CREAT_NEW_DASHBOARD_BTN); - } - public WebElement alarmWidgetBundle() { return waitUntilElementToBeClickable(ALARM_WIDGET_BUNDLE); } @@ -82,7 +77,7 @@ public class DashboardPageElements extends OtherPageElementsHelper { return waitUntilElementToBeClickable(WIDGET_SE_CORNER); } - public WebElement doneBtn() { - return waitUntilVisibilityOfElementLocated(DONE_BTN); + public WebElement saveBtn() { + return waitUntilVisibilityOfElementLocated(SAVE_BTN); } } diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DashboardPageHelper.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DashboardPageHelper.java index 93e8fa10d4..7a89b876f6 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DashboardPageHelper.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DashboardPageHelper.java @@ -40,7 +40,6 @@ public class DashboardPageHelper extends DashboardPageElements { public void openSelectWidgetsBundleMenu() { addBtn().click(); - createNewDashboardBtn().click(); } public void openCreateWidgetPopup() { diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AbstractAssignTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AbstractAssignTest.java similarity index 98% rename from msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AbstractAssignTest.java rename to msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AbstractAssignTest.java index 1d13d16f4b..29b207534d 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AbstractAssignTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AbstractAssignTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.msa.ui.tests.assignee; +package org.thingsboard.server.msa.ui.tests.alarmassignee; import io.qameta.allure.Epic; import org.testng.annotations.AfterClass; diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AssignDetailsTabAssignTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AssignDetailsTabAssignTest.java similarity index 97% rename from msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AssignDetailsTabAssignTest.java rename to msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AssignDetailsTabAssignTest.java index 9f90dddc90..3b80af3ffc 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AssignDetailsTabAssignTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AssignDetailsTabAssignTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.msa.ui.tests.assignee; +package org.thingsboard.server.msa.ui.tests.alarmassignee; import io.qameta.allure.Description; import io.qameta.allure.Feature; @@ -161,15 +161,13 @@ public class AssignDetailsTabAssignTest extends AbstractAssignTest { } @Description("Search by name") - @Test(groups = "broken") + @Test public void searchByName() { sideBarMenuView.goToDevicesPage(); devicePage.openDeviceAlarms(deviceName); alarmPage.searchAlarm(alarmType, userName); - alarmPage.setUsers(); - assertThat(alarmPage.getUsers()).hasSize(1).as("Search result contains search input").contains(userName); - alarmPage.assignUsers().forEach(this::assertIsDisplayed); + assertIsDisplayed(alarmPage.noUsersFoundMessage()); } @Description("Assign alarm to yourself from details of alarm") diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AssignDetailsTabFromCustomerAssignTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AssignDetailsTabFromCustomerAssignTest.java similarity index 99% rename from msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AssignDetailsTabFromCustomerAssignTest.java rename to msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AssignDetailsTabFromCustomerAssignTest.java index 301a61fdf4..a468194f27 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AssignDetailsTabFromCustomerAssignTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AssignDetailsTabFromCustomerAssignTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.msa.ui.tests.assignee; +package org.thingsboard.server.msa.ui.tests.alarmassignee; import io.qameta.allure.Description; import io.qameta.allure.Feature; diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AssignFromAlarmWidgetTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AssignFromAlarmWidgetTest.java similarity index 93% rename from msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AssignFromAlarmWidgetTest.java rename to msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AssignFromAlarmWidgetTest.java index 5a2d6cd0c5..57fe5ec745 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/assignee/AssignFromAlarmWidgetTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/alarmassignee/AssignFromAlarmWidgetTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.msa.ui.tests.assignee; +package org.thingsboard.server.msa.ui.tests.alarmassignee; import io.qameta.allure.Description; import io.qameta.allure.Feature; @@ -56,7 +56,7 @@ public class AssignFromAlarmWidgetTest extends AbstractAssignTest { createWidgetPopup.addAliasBtn().click(); createWidgetPopup.addWidgetBtn().click(); dashboardPage.increaseSizeOfTheWidget(); - dashboardPage.doneBtn().click(); + dashboardPage.saveBtn().click(); } @AfterClass @@ -135,12 +135,10 @@ public class AssignFromAlarmWidgetTest extends AbstractAssignTest { } @Description("Search by name") - @Test(groups = "broken") + @Test public void searchByName() { alarmWidget.searchAlarm(alarmType, userName); - alarmWidget.setUsers(); - assertThat(alarmWidget.getUsers()).hasSize(1).as("Search result contains search input").contains(userName); - alarmWidget.assignUsers().forEach(this::assertIsDisplayed); + assertIsDisplayed(alarmWidget.noUsersFoundMessage()); } } 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 c59ccd62f4..c367aa869d 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 @@ -207,9 +207,9 @@ public class CreateCustomerTest extends AbstractDriverBaseTest { sideBarMenuView.customerBtn().click(); customerPage.plusBtn().click(); - customerPage.titleFieldAddEntityView().sendKeys(customerName); - customerPage.phoneNumberAddEntityView().sendKeys(number); - customerPage.phoneNumberAddEntityView().sendKeys(Keys.CONTROL + "A" + Keys.BACK_SPACE); + customerPage.addCustomerViewEnterName(customerName); + customerPage.enterText(customerPage.phoneNumberAddEntityView(), number); + customerPage.clearInputField(customerPage.phoneNumberAddEntityView()); customerPage.addBtnC().click(); this.customerName = customerName; customerPage.entity(customerName).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 47d950c312..c807a6a505 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 @@ -204,31 +204,32 @@ public class CustomerEditMenuTest extends AbstractDriverBaseTest { @Epic("Customers smoke tests") @Feature("Edit customer") - @Test(priority = 20, groups = "smoke") + @Test(priority = 20, groups = { "smoke", "broken" }) @Description("Assigned dashboard without hide") public void assignedDashboardWithoutHide() { String customerName = ENTITY_NAME + random(); + String dashboardName = "Firmware"; testRestClient.postCustomer(defaultCustomerPrototype(customerName)); this.customerName = customerName; sideBarMenuView.customerBtn().click(); customerPage.manageCustomersDashboardsBtn(customerName).click(); - customerPage.assignedDashboard(); + customerPage.assignedDashboard(dashboardName); sideBarMenuView.customerBtn().click(); customerPage.entity(customerName).click(); jsClick(customerPage.editPencilBtn()); - customerPage.chooseDashboard(customerPage.getDashboard()); - customerPage.hideHomeDashboardToolbarCheckbox().click(); + customerPage.chooseDashboard(dashboardName); + customerPage.disableHideHomeDashboardToolbar(); customerPage.doneBtnEditView().click(); + customerPage.waitUntilDashboardFieldToBeNotEmpty(); customerPage.setDashboardFromView(); customerPage.closeEntityViewBtn().click(); jsClick(customerPage.manageCustomersUserBtn(customerName)); customerPage.createCustomersUser(); jsClick(customerPage.userLoginBtn()); - Assert.assertNotNull(customerPage.usersWidget()); Assert.assertTrue(customerPage.usersWidget().isDisplayed()); - Assert.assertEquals(customerPage.getDashboard(), customerPage.getDashboardFromView()); + Assert.assertEquals(dashboardName, customerPage.getDashboardFromView()); Assert.assertNotNull(customerPage.stateController()); Assert.assertNotNull(customerPage.filterBtn()); Assert.assertNotNull(customerPage.timeBtn()); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeviceFilterTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeviceFilterTest.java index c0fa238dee..89f4e91f67 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeviceFilterTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeviceFilterTest.java @@ -16,7 +16,7 @@ package org.thingsboard.server.msa.ui.tests.devicessmoke; import io.qameta.allure.Description; -import io.qameta.allure.Epic; +import io.qameta.allure.Feature; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; -@Epic("Filter devices (By device profile and state)") +@Feature("Filter devices (By device profile and state)") public class DeviceFilterTest extends AbstractDeviceTest { private String activeDeviceName; diff --git a/msa/black-box-tests/src/test/resources/assignee.xml b/msa/black-box-tests/src/test/resources/alarmAssignee.xml similarity index 95% rename from msa/black-box-tests/src/test/resources/assignee.xml rename to msa/black-box-tests/src/test/resources/alarmAssignee.xml index 49fe1aa195..169a1edf32 100644 --- a/msa/black-box-tests/src/test/resources/assignee.xml +++ b/msa/black-box-tests/src/test/resources/alarmAssignee.xml @@ -18,7 +18,7 @@ --> - + @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/msa/black-box-tests/src/test/resources/all.xml b/msa/black-box-tests/src/test/resources/all.xml index 95248a6fe6..7bf6c85546 100644 --- a/msa/black-box-tests/src/test/resources/all.xml +++ b/msa/black-box-tests/src/test/resources/all.xml @@ -77,4 +77,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/msa/black-box-tests/src/test/resources/uiTests.xml b/msa/black-box-tests/src/test/resources/uiTests.xml index 9de384d15c..e9bea8b1ef 100644 --- a/msa/black-box-tests/src/test/resources/uiTests.xml +++ b/msa/black-box-tests/src/test/resources/uiTests.xml @@ -72,4 +72,14 @@ + + + + + + + + + + \ No newline at end of file