From ae8aec6a4e08388b99eddfc568b70040f16eaf7c Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Mon, 9 Jan 2017 16:59:05 +0530 Subject: [PATCH] Fixing the existing UI integration tests. --- .../ui/pages/groups/DeviceGroupsPage.java | 7 +++---- .../iot/integration/ui/pages/uesr/AddUserPage.java | 2 +- .../src/main/resources/mapper.properties | 14 +++++++------- .../tests-iot-web-ui/src/test/resources/testng.xml | 8 ++++---- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java index 8a05cd55..becb12fa 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java @@ -41,8 +41,7 @@ public class DeviceGroupsPage { this.uiElementMapper = UIElementMapper.getInstance(); WebDriverWait webDriverWait = new WebDriverWait(driver, UIUtils.webDriverTimeOut); - if (!webDriverWait.until(ExpectedConditions.textToBePresentInElement(driver.findElement(By.xpath( - uiElementMapper.getElement("iot.device.groups.view.header.xpath"))), "GROUP"))) { + if (!webDriverWait.until(ExpectedConditions.titleContains(uiElementMapper.getElement("cdmf.groups.page")))) { throw new IllegalStateException("This is not the Groups page"); } } @@ -64,8 +63,8 @@ public class DeviceGroupsPage { * @return : True if the group is visible. False otherwise. */ public boolean isGroupCreated(String groupName) { - WebElement table = driver.findElement(By.id(uiElementMapper.getElement("iot.device.table.id"))); - List allGroupNames = table.findElements(By.tagName("h4")); + WebElement table = driver.findElement(By.xpath(uiElementMapper.getElement("iot.device.table.id"))); + List allGroupNames = table.findElements(By.tagName("td")); for (WebElement name : allGroupNames) { if (name.getText().contains(groupName)){ diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java index 02fce92f..3305fbda 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java @@ -41,7 +41,7 @@ public class AddUserPage { this.uiElementMapper = UIElementMapper.getInstance(); WebDriverWait webDriverWait = new WebDriverWait(driver, UIUtils.webDriverTimeOut); - if (!webDriverWait.until(ExpectedConditions.titleContains("User Management | IoT Server"))) { + if (!webDriverWait.until(ExpectedConditions.titleContains(uiElementMapper.getElement("cdmf.user.add.page")))) { throw new IllegalStateException("This is not the Add User page"); } } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties b/modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties index e212e65e..edba2fed 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties +++ b/modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties @@ -23,6 +23,7 @@ cdmf.register.page=Register | CDMF cdmf.error.page=Error | CDMF cdmf.user.home.page=Device Management | CDMF cdmf.groups.page=Group Management | CDMF +cdmf.user.add.page=User Management | Add User | CDMF # User registration and login details----------------------------------------------------------------------------------- @@ -105,11 +106,11 @@ iot.device.groups.view.header.xpath=/html/body/div[3]/div[2]/div/h1[1] #/html/body/div[3]/div[2]/div/div[3]/div/div/div[1]/label iot.device.groups.add.emptyfrom.error=/html/body/div[3]/div[2]/div/div[3]/div/div/div[1]/label -iot.device.table.id=group-grid +iot.device.table.id=//*[@id="ast-container"] #Add user -------------------------------------------------------------------------------------------------------------- -iot.admin.user.addButton.xpath=/html/body/div[3]/div[2]/div[1]/div[3]/div/div/div[2]/div[2]/span[2]/a[2]/span/i[2] -iot.admin.user.viewButton.xpath=/html/body/div[3]/div[2]/div[1]/div[3]/div/div/div[2]/div[2]/span[2]/a[1]/span/i[2] +iot.admin.user.addButton.xpath=/html/body/div[3]/div[2]/div/div[3]/div[3]/div/div[2]/div[2]/span[2]/a[2] +iot.admin.user.viewButton.xpath=/html/body/div[3]/div[2]/div/div[3]/div[3]/div/div[2]/div[2]/span[2]/a[1] iot.admin.user.added.page.subtitle.xpath="//p[@class='page-sub-title']" iot.admin.user.listing.page.subtitle.xpath="//span[@class='page-sub-title']" @@ -123,10 +124,9 @@ iot.admin.addUser.roles.id=roles iot.admin.addUser.add.btn.xpath=//*[@id="add-user-btn"] iot.admin.addUser.view.btn.xpath=//*[@id="user-created-msg"]/div/button -iot.admin.deleteUser.btn.xpath=//*[@id="user1"]/td[5]/a[3]/span[1]/i[2] -iot.admin.deleteUser.yes.link.xpath=//a[@id="remove-user-yes-link"] -iot.admin.deleteUser.success.link.xpath=//a[@id="remove-user-success-link"] - +iot.admin.deleteUser.btn.xpath=//*[@id="user-user1"]/td[5]/a[3]/span[1]/i[2] +iot.admin.deleteUser.yes.link.xpath=//*[@id="remove-user-yes-link"] +iot.admin.deleteUser.success.link.xpath=//*[@id="modal-footer-content"]/div/a iot.admin.addUser.formError.xpath=//*[@id="user-create-error-msg"] #----- User view page heading ------------------------------------------------------------------------------------------ diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/testng.xml b/modules/integration/tests-iot-web-ui/src/test/resources/testng.xml index 5ff41446..73139933 100644 --- a/modules/integration/tests-iot-web-ui/src/test/resources/testng.xml +++ b/modules/integration/tests-iot-web-ui/src/test/resources/testng.xml @@ -31,10 +31,10 @@ - - - - + + + +