Merge pull request #248 from menakaj/master

Fixing the existing UI integration tests.

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(
+        if (!webDriverWait.until(ExpectedConditions.titleContains(uiElementMapper.getElement("cdmf.groups.page")))) {
-                uiElementMapper.getElement("iot.device.groups.view.header.xpath"))), "GROUP"))) {
             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")));
+        WebElement table = driver.findElement(By.xpath(uiElementMapper.getElement("iot.device.table.id")));
-        List<WebElement> allGroupNames = table.findElements(By.tagName("h4"));
+        List<WebElement> allGroupNames = table.findElements(By.tagName("td"));
 
         for (WebElement name : allGroupNames) {
             if (name.getText().contains(groupName)){

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");
         }
     }

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.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[1]/div[3]/div/div/div[2]/div[2]/span[2]/a[1]/span/i[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.btn.xpath=//*[@id="user-user1"]/td[5]/a[3]/span[1]/i[2]
-iot.admin.deleteUser.yes.link.xpath=//a[@id="remove-user-yes-link"]
+iot.admin.deleteUser.yes.link.xpath=//*[@id="remove-user-yes-link"]
-iot.admin.deleteUser.success.link.xpath=//a[@id="remove-user-success-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 ------------------------------------------------------------------------------------------

modules/integration/tests-iot-web-ui/src/test/resources/testng.xml

@@ -31,10 +31,10 @@
             <class name="org.wso2.carbon.iot.integration.web.ui.test.login.LoginTest"/>
             <class name="org.wso2.carbon.iot.integration.web.ui.test.user.RegistrationFormValidationTest"/>
             <class name="org.wso2.carbon.iot.integration.web.ui.test.user.NewUserRegistrationTest"/>
-            <!--<class name="org.wso2.carbon.iot.integration.web.ui.test.group.DeviceGroupTest"/>-->
+            <class name="org.wso2.carbon.iot.integration.web.ui.test.group.DeviceGroupTest"/>
-            <!--<class name="org.wso2.carbon.iot.integration.web.ui.test.group.DeviceGroupFailTest"/>-->
+            <class name="org.wso2.carbon.iot.integration.web.ui.test.group.DeviceGroupFailTest"/>
-            <!--<class name="org.wso2.carbon.iot.integration.web.ui.test.user.AddUserFormValidationTest"/>-->
+            <class name="org.wso2.carbon.iot.integration.web.ui.test.user.AddUserFormValidationTest"/>
-            <!--<class name="org.wso2.carbon.iot.integration.web.ui.test.user.AdminFunctionsTest"/>-->
+            <class name="org.wso2.carbon.iot.integration.web.ui.test.user.AdminFunctionsTest"/>
             <!--
             <class name="org.wso2.carbon.iot.integration.web.ui.test.samples.SampleInstallationTest"/>
             <class name="org.wso2.carbon.iot.integration.web.ui.test.samples.SampleInstallationVerification"/>