From 399136daae1b5183134e5b3da6c5fef9fa633f47 Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Mon, 23 Oct 2017 15:46:08 +0530 Subject: [PATCH] Changes and Improvements as per the code review. --- .../wso2/iot/integration/ui/pages/UIUtils.java | 1 - .../ui/pages/devices/DevicesPage.java | 15 +++++++-------- .../ui/pages/devices/EnrollDevicePage.java | 3 +-- .../ui/pages/error/IOTErrorPage.java | 18 +++++++++++++++++- .../iot/integration/ui/pages/graphs/Graph.java | 1 - .../ui/pages/groups/DeviceAddGroupPage.java | 2 -- .../ui/pages/groups/DeviceGroupsPage.java | 1 - .../ui/pages/home/IOTAdminDashboard.java | 1 - .../integration/ui/pages/home/IOTHomePage.java | 3 --- .../integration/ui/pages/login/LoginPage.java | 1 - .../samples/ConnectedCupDeviceInterface.java | 1 - .../ConnectedCupDeviceTypeViewPage.java | 2 -- .../samples/ConnectedCupDeviceViewPage.java | 1 - .../integration/ui/pages/uesr/AddUserPage.java | 2 -- .../ui/pages/uesr/EditUserPage.java | 1 - .../ui/pages/uesr/NewUserRegisterPage.java | 1 - .../pages/uesr/UserAddedConfirmationPage.java | 1 - .../ui/pages/uesr/UserListingPage.java | 1 - .../ui/pages/uesr/ViewUserPage.java | 1 - 19 files changed, 25 insertions(+), 32 deletions(-) diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java index 09346afb..d256cecf 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java @@ -45,5 +45,4 @@ public class UIUtils { } } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java index c87dafa3..41ac7dd7 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java @@ -80,11 +80,11 @@ public class DevicesPage { */ public ConnectedCupDeviceViewPage viewDevice(String deviceName) throws IOException { WebElement deviceTable = driver.findElement(By.xpath(uiElementMapper.getElement("iot.devices.table.xpath"))); - List data = deviceTable.findElements(By.cssSelector("a")); - for (WebElement e : data) { - String s = getLink(e, "/device/connectedcup?id="); - if (s != null) { - driver.get(s); + List anchors = deviceTable.findElements(By.cssSelector("a")); + for (WebElement element : anchors) { + String connectedCupLink = getLink(element, "/device/connectedcup?id="); + if (connectedCupLink != null) { + driver.get(connectedCupLink); return new ConnectedCupDeviceViewPage(driver, deviceName); } } @@ -100,12 +100,11 @@ public class DevicesPage { private String getLink(WebElement element, String... lookupText) { String link = element.getAttribute("href"); boolean check = true; - for (String s : lookupText) { - if (!link.contains(s)) { + for (String text : lookupText) { + if (!link.contains(text)) { check = false; } } return check ? link : null; } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java index a6c55025..a7f74639 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java @@ -81,9 +81,8 @@ public class EnrollDevicePage { tryBtn.click(); return new ConnectedCupDeviceTypeViewPage(driver); } else { - log.error("Element not found..........................."); + log.error("Element not found!"); return null; } } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java index da402c96..eadcf229 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.wso2.iot.integration.ui.pages.error; import org.openqa.selenium.WebDriver; @@ -24,7 +41,6 @@ public class IOTErrorPage { throw new IllegalStateException("This is not the Error page"); } } - public boolean isErrorPresent() { return this.isErrorPage; } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java index 1058f2f6..18faacb4 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java @@ -60,5 +60,4 @@ public class Graph { return String.format("The graph for graph id : %s, X - axis : %s, Y - axis : %s, legend : %s ", graphId, xAxis, yAxis, legend); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java index b80d0efb..cdcca5fd 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java @@ -47,7 +47,6 @@ public class DeviceAddGroupPage { } } - /** * This method performs creation of a new device group. * @param name : The group name that is need to be created. @@ -91,5 +90,4 @@ public class DeviceAddGroupPage { return driver.findElement(By.xpath( uiElementMapper.getElement("iot.device.groups.add.emptyfrom.error"))).getText(); } - } 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 becb12fa..19c8387d 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 @@ -73,5 +73,4 @@ public class DeviceGroupsPage { } return false; } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java index 828e582b..f0ed3a50 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java @@ -132,6 +132,5 @@ public class IOTAdminDashboard { driver.findElement(By.xpath(uiElementMapper.getElement("iot.admin.device.viewBtn.xpath"))).click(); return new DevicesPage(driver); } - //ToDo : Need to add policy methods } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java index 58b929e9..28ef791a 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java @@ -57,7 +57,6 @@ public class IOTHomePage { return name.contains(uiElementMapper.getElement("iot.user.login.username")); } - /** * Performs the logout function. * @return : IOT login page. @@ -90,7 +89,5 @@ public class IOTHomePage { driver.findElement(By.xpath("iot.device.viewGroup.empty.addGroup.xpath")).click(); return new DeviceAddGroupPage(driver); } - //ToDo : To add policies - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java index 91fb30c6..8e2cffc1 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java @@ -101,5 +101,4 @@ public class LoginPage { registerLink.click(); return new NewUserRegisterPage(driver); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java index 2ea11f7a..6477686b 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java @@ -110,5 +110,4 @@ public class ConnectedCupDeviceInterface { Action action = move.dragAndDropBy(slider, 0, val).build(); action.perform(); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java index 2fa4e605..879d8ed0 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java @@ -17,7 +17,6 @@ */ package org.wso2.iot.integration.ui.pages.samples; - import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -79,5 +78,4 @@ public class ConnectedCupDeviceTypeViewPage { return driver.findElement(By.xpath( uiElementMapper.getElement("iot.sample.connectedcup.page.title"))).getText().contains("Connected Cup"); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java index 5631a564..0681a141 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java @@ -170,5 +170,4 @@ public class ConnectedCupDeviceViewPage { return false; } } - } 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 3305fbda..78d5b451 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 @@ -27,7 +27,6 @@ import org.wso2.iot.integration.ui.pages.UIElementMapper; import java.io.IOException; - /** * This class represents the add user page of the IOT server. */ @@ -76,5 +75,4 @@ public class AddUserPage { return new UserAddedConfirmationPage(driver); } - } \ No newline at end of file diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java index dcba72e6..6141e2a8 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java @@ -48,5 +48,4 @@ public class EditUserPage { public void editUser(String password, String firstName, String lastName) { driver.findElement(By.xpath(uiElementMapper.getElement("iot.user.add.input.password.xpath"))); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java index b40dfe51..baa1e8c7 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java @@ -127,5 +127,4 @@ public class NewUserRegisterPage { passwordField.clear(); passwordConfirmationField.clear(); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java index a32087e4..6e5d55a0 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java @@ -33,5 +33,4 @@ public class UserAddedConfirmationPage { driver.findElement(By.xpath(uiElementMapper.getElement("iot.admin.addUser.view.btn.xpath"))).click(); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java index 7d6fe4e1..fd4c96a4 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java @@ -64,5 +64,4 @@ public class UserListingPage { return new UserListingPage(driver); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java index a4d3964e..c2b57eaa 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java @@ -43,5 +43,4 @@ public class ViewUserPage { throw new IllegalStateException("This is not the User view page"); } } - }