application-manager-new
Rasika Perera 8 years ago
commit e04be13e52

@ -89,6 +89,6 @@
"protocol": "" "protocol": ""
}, },
"queryParameters" : { "queryParameters" : {
"passBetweenPages" : ["shared"] "passBetweenPages" : ["shared", "owner", "deviceId"]
} }
} }

@ -1255,5 +1255,15 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-api-config.xml
</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/conf/
</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
</files> </files>
</assembly> </assembly>

@ -152,6 +152,14 @@
<!-- for different message format serializations in Axis2. These message formats are --> <!-- for different message format serializations in Axis2. These message formats are -->
<!-- expected to be resolved based on the content type. --> <!-- expected to be resolved based on the content type. -->
<messageFormatters> <messageFormatters>
<messageFormatter contentType="application/x-apple-aspen-mdm"
class="org.apache.axis2.format.PlainTextFormatter"/>
<messageFormatter contentType="application/x-apple-aspen-config"
class="org.apache.axis2.format.PlainTextFormatter"/>
<messageFormatter contentType="application/pkcs7-signature"
class="org.apache.axis2.format.PlainTextFormatter"/>
<messageFormatter contentType="application/x-www-form-urlencoded" <messageFormatter contentType="application/x-www-form-urlencoded"
class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/> class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
<messageFormatter contentType="multipart/form-data" <messageFormatter contentType="multipart/form-data"
@ -220,6 +228,15 @@
<!-- different message formats in Axis2. These message formats are expected to be --> <!-- different message formats in Axis2. These message formats are expected to be -->
<!-- resolved based on the content type. --> <!-- resolved based on the content type. -->
<messageBuilders> <messageBuilders>
<messageBuilder contentType="application/x-apple-aspen-mdm"
class="org.apache.axis2.format.PlainTextBuilder"/>
<messageBuilder contentType="application/x-apple-aspen-config"
class="org.apache.axis2.format.PlainTextBuilder"/>
<messageBuilder contentType="application/pkcs7-signature"
class="org.apache.axis2.format.PlainTextBuilder"/>
<messageBuilder contentType="application/xml" <messageBuilder contentType="application/xml"
class="org.apache.axis2.builder.ApplicationXMLBuilder"/> class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
<messageBuilder contentType="text/html" <messageBuilder contentType="text/html"
@ -322,6 +339,7 @@
<Password>wso2carbon</Password> <Password>wso2carbon</Password>
</TrustStore> </TrustStore>
</parameter> </parameter>
<parameter name="HostnameVerifier">AllowAll</parameter>
<!--<parameter name="SSLVerifyClient">require</parameter> <!--<parameter name="SSLVerifyClient">require</parameter>
supports optional|require or defaults to none --> supports optional|require or defaults to none -->
</transportReceiver> </transportReceiver>

@ -146,6 +146,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.handler.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
@ -903,6 +906,10 @@
<id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id> <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.handler.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id> <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -1843,6 +1850,10 @@
<id>org.wso2.carbon.apimgt.gateway.feature.group</id> <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.apimgt.handler.server.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.policy.mgt.server.feature.group</id> <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId> <artifactId>wso2iot-parent</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
@ -35,8 +35,8 @@
<modules> <modules>
<module>tests-artifacts</module> <module>tests-artifacts</module>
<module>tests-common</module> <module>tests-common</module>
<module>tests-integration</module> <!--<module>tests-integration</module>-->
<module>tests-ui-integration</module> <!--<module>tests-ui-integration</module>-->
<module>tests-iot-web-ui</module> <module>tests-iot-web-ui</module>
</modules> </modules>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId> <artifactId>wso2iot-integration</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>tests-common</artifactId> <artifactId>tests-common</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>tests-common</artifactId> <artifactId>tests-common</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId> <artifactId>wso2iot-integration</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>tests-common</artifactId> <artifactId>tests-common</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>tests-common</artifactId> <artifactId>tests-common</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -0,0 +1,31 @@
package org.wso2.iot.integration.ui.pages.error;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.wso2.iot.integration.ui.pages.UIElementMapper;
import org.wso2.iot.integration.ui.pages.UIUtils;
import java.io.IOException;
public class IOTErrorPage {
private WebDriver driver;
private UIElementMapper uiElementMapper;
private boolean isErrorPage = true;
public IOTErrorPage (WebDriver driver) throws IOException {
this.driver = driver;
this.uiElementMapper = UIElementMapper.getInstance();
WebDriverWait webDriverWait = new WebDriverWait(driver, UIUtils.webDriverTimeOut);
if (!webDriverWait.until(ExpectedConditions.titleContains(uiElementMapper.getElement("cdmf.error.page")))) {
isErrorPage = false;
throw new IllegalStateException("This is not the Error page");
}
}
public boolean isErrorPresent() {
return this.isErrorPage;
}
}

@ -20,7 +20,10 @@ package org.wso2.iot.integration.ui.pages.groups;
import org.openqa.selenium.By; import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement; import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.wso2.iot.integration.ui.pages.UIElementMapper; import org.wso2.iot.integration.ui.pages.UIElementMapper;
import org.wso2.iot.integration.ui.pages.UIUtils;
import java.io.IOException; import java.io.IOException;
@ -37,9 +40,9 @@ public class DeviceAddGroupPage {
public DeviceAddGroupPage(WebDriver driver) throws IOException { public DeviceAddGroupPage(WebDriver driver) throws IOException {
this.driver = driver; this.driver = driver;
this.uiElementMapper = UIElementMapper.getInstance(); this.uiElementMapper = UIElementMapper.getInstance();
WebDriverWait webDriverWait = new WebDriverWait(driver, UIUtils.webDriverTimeOut);
if (!driver.findElement(By.xpath if (!webDriverWait.until(ExpectedConditions.titleContains(uiElementMapper.getElement("cdmf.groups.page")))) {
(uiElementMapper.getElement("iot.device.group.addNewGroup.xpath"))).getText().contains("ADD NEW GROUP")) {
throw new IllegalStateException("This is not the Add Group page"); throw new IllegalStateException("This is not the Add Group page");
} }
} }

@ -42,7 +42,7 @@ public class DeviceGroupsPage {
WebDriverWait webDriverWait = new WebDriverWait(driver, UIUtils.webDriverTimeOut); WebDriverWait webDriverWait = new WebDriverWait(driver, UIUtils.webDriverTimeOut);
if (!webDriverWait.until(ExpectedConditions.textToBePresentInElement(driver.findElement(By.xpath( if (!webDriverWait.until(ExpectedConditions.textToBePresentInElement(driver.findElement(By.xpath(
uiElementMapper.getElement("iot.device.groups.view.header.xpath"))), "GROUPS"))) { uiElementMapper.getElement("iot.device.groups.view.header.xpath"))), "GROUP"))) {
throw new IllegalStateException("This is not the Groups page"); throw new IllegalStateException("This is not the Groups page");
} }
} }

@ -22,7 +22,10 @@ import org.apache.commons.logging.LogFactory;
import org.openqa.selenium.By; import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement; import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.wso2.iot.integration.ui.pages.UIElementMapper; import org.wso2.iot.integration.ui.pages.UIElementMapper;
import org.wso2.iot.integration.ui.pages.UIUtils;
import org.wso2.iot.integration.ui.pages.devices.DevicesPage; import org.wso2.iot.integration.ui.pages.devices.DevicesPage;
import org.wso2.iot.integration.ui.pages.devices.EnrollDevicePage; import org.wso2.iot.integration.ui.pages.devices.EnrollDevicePage;
import org.wso2.iot.integration.ui.pages.groups.DeviceAddGroupPage; import org.wso2.iot.integration.ui.pages.groups.DeviceAddGroupPage;
@ -51,18 +54,16 @@ import java.io.IOException;
*/ */
public class IOTAdminDashboard { public class IOTAdminDashboard {
private static final Log log = LogFactory.getLog(IOTHomePage.class); private static final Log log = LogFactory.getLog(IOTAdminDashboard.class);
private WebDriver driver; private WebDriver driver;
private UIElementMapper uiElementMapper; private UIElementMapper uiElementMapper;
public IOTAdminDashboard(WebDriver driver) throws IOException { public IOTAdminDashboard(WebDriver driver) throws IOException {
this.driver = driver; this.driver = driver;
this.uiElementMapper = UIElementMapper.getInstance(); this.uiElementMapper = UIElementMapper.getInstance();
log.info(driver.findElement(By.xpath(uiElementMapper.getElement("iot.admin.dashboard.title.xpath"))). WebDriverWait wait = new WebDriverWait(driver, UIUtils.webDriverTimeOut);
getText());
// Check that we're on the right page. if (!wait.until(ExpectedConditions.titleIs(uiElementMapper.getElement("cdmf.home.page")))) {
if (!driver.findElement(By.xpath(uiElementMapper.getElement("iot.admin.dashboard.title.xpath"))).
getText().contains("DASHBOARD")) {
throw new IllegalStateException("This is not the home page"); throw new IllegalStateException("This is not the home page");
} }
} }

@ -43,7 +43,7 @@ public class IOTHomePage {
this.uiElementMapper = UIElementMapper.getInstance(); this.uiElementMapper = UIElementMapper.getInstance();
// Check that we're on the right page. // Check that we're on the right page.
WebDriverWait wait = new WebDriverWait(driver, UIUtils.webDriverTimeOut); WebDriverWait wait = new WebDriverWait(driver, UIUtils.webDriverTimeOut);
if (!wait.until(ExpectedConditions.titleIs("Device Management | IoT Server"))) { if (!wait.until(ExpectedConditions.titleIs(uiElementMapper.getElement("cdmf.user.home.page")))) {
throw new IllegalStateException("This is not the home page"); throw new IllegalStateException("This is not the home page");
} }
} }

@ -50,7 +50,7 @@ public class LoginPage {
this.uiElementMapper = UIElementMapper.getInstance(); this.uiElementMapper = UIElementMapper.getInstance();
WebDriverWait webDriverWait = new WebDriverWait(driver, UIUtils.webDriverTimeOut); WebDriverWait webDriverWait = new WebDriverWait(driver, UIUtils.webDriverTimeOut);
if (!webDriverWait.until(ExpectedConditions.titleContains("Login | IoT Server"))) { if (!webDriverWait.until(ExpectedConditions.titleContains(uiElementMapper.getElement("cdmf.login.page")))) {
throw new IllegalStateException("This is not the Login page"); throw new IllegalStateException("This is not the Login page");
} }
userNameField = driver.findElement(By.xpath( userNameField = driver.findElement(By.xpath(

@ -49,7 +49,7 @@ public class NewUserRegisterPage {
// Check that we're on the right page. // Check that we're on the right page.
WebDriverWait webDriverWait = new WebDriverWait(driver, UIUtils.webDriverTimeOut); WebDriverWait webDriverWait = new WebDriverWait(driver, UIUtils.webDriverTimeOut);
if (!webDriverWait.until(ExpectedConditions.titleContains("Register | IoT Server"))) { if (!webDriverWait.until(ExpectedConditions.titleContains(uiElementMapper.getElement("cdmf.register.page")))) {
throw new IllegalStateException("This is not the Register page"); throw new IllegalStateException("This is not the Register page");
} }

@ -16,6 +16,14 @@
# under the License. # under the License.
# #
# CDMF Page titles -----------------------------------------------------------------------------------------------------
cdmf.home.page=Home | CDMF
cdmf.login.page=Login | CDMF
cdmf.register.page=Register | CDMF
cdmf.error.page=Error | CDMF
cdmf.user.home.page=Device Management | CDMF
cdmf.groups.page=Group Management | CDMF
# User registration and login details----------------------------------------------------------------------------------- # User registration and login details-----------------------------------------------------------------------------------
iot.user.add.firstname=firstname iot.user.add.firstname=firstname
@ -27,9 +35,10 @@ iot.user.add.email=username@wso2.com
iot.user.login.username=testUser iot.user.login.username=testUser
iot.user.login.password=testPassword iot.user.login.password=testPassword
# User registration and login ui---------------------------------------------------------------------------------------- # User registration and login ui----------------------------------------------------------------------------------------
iot.user.registered.name=/html/body/header/div/div[2]/a/span[1] iot.user.registered.name=/html/body/header/div/div[2]/ul/li/a/span[2]
iot.user.add.input.firstname.xpath=//*[@id="first_name"] iot.user.add.input.firstname.xpath=//*[@id="first_name"]
iot.user.add.input.lastname.xpath=//*[@id="last_name"] iot.user.add.input.lastname.xpath=//*[@id="last_name"]
@ -58,18 +67,13 @@ iot.home.page.title.xpath=/html/body/div[3]/div[1]/div/span
iot.admin.dashboard.title.xpath=/html/body/div[3]/div[1]/div/span iot.admin.dashboard.title.xpath=/html/body/div[3]/div[1]/div/span
iot.home.enrollDevice.xpath=//*[@id="ast-container"]/div/p/a iot.home.enrollDevice.xpath=//*[@id="ast-container"]/div/p/a
iot.user.logout.link.xpath=/html/body/header/div/div[2]/ul/li[3]/a iot.user.logout.link.xpath=/html/body/header/div/div[2]/ul/li/ul/li[2]/a
iot.devices.table.xpath=//*[@id="device-grid"] iot.devices.table.xpath=//*[@id="device-grid"]
# Register page error elements ----------------------------------------------------------------------------------------- # Register page error elements -----------------------------------------------------------------------------------------
#//*[@id="user-create-error-msg"]
iot.user.register.firstname.error=first_name-error iot.user.register.form.error=user-create-error-msg
iot.user.register.lastname.error=last_name-error
iot.user.register.username.error=user_name-error
iot.user.register.email.error=email-error
iot.user.register.password.error=password-error
iot.user.register.confirmPassword.error=password_confirmation-error
# Admin dashboard Device ----------------------------------------------------------------------------------------------- # Admin dashboard Device -----------------------------------------------------------------------------------------------
iot.admin.device.viewBtn.xpath=//a[@href='/devicemgt/devices'] iot.admin.device.viewBtn.xpath=//a[@href='/devicemgt/devices']
@ -81,13 +85,12 @@ iot.user.login.password.error=password-error
iot.user.login.incorrect.xpath=/html/body/div/div/div/div[1] iot.user.login.incorrect.xpath=/html/body/div/div/div/div[1]
iot.user.login.shortPassword=password-error iot.user.login.shortPassword=password-error
iot.dashboard.device.div.xpath=/html/body/div[3]/div[7]/div[1]/div/div/div[1] iot.dashboard.device.div.xpath=/html/body/div[3]/div[7]/div[1]/div/div/div[1]
#Grouping -------------------------------------------------------------------------------------------------------------- #Grouping --------------------------------------------------------------------------------------------------------------
iot.device.group.addButton.xpath=/html/body/div[3]/div[2]/div[1]/div[2]/div/div/div[2]/div[2]/span[2]/a[2] iot.device.group.addButton.xpath=/html/body/div[3]/div[2]/div/div[3]/div[2]/div/div[2]/div[2]/span[2]/a[2]/span/i[2]
iot.device.group.viewButton.xpath=/html/body/div[3]/div[2]/div[1]/div[2]/div/div/div[2]/div[2]/span[2]/a[1] iot.device.group.viewButton.xpath=/html/body/div[3]/div[2]/div/div[3]/div[2]/div/div[2]/div[2]/span[2]/a[1]/span/i[2]
iot.device.group.addNewGroup.xpath=/html/body/div[3]/div/div[1]/div/p[1] iot.device.group.addNewGroup.xpath=/html/body/div[3]/div/div[1]/div/p[1]
@ -97,9 +100,10 @@ iot.device.group.addGroupForm.name.id=name
iot.device.group.addGroupForm.description.id=description iot.device.group.addGroupForm.description.id=description
iot.device.group.addGroupForm.addButton.id=add-group-btn iot.device.group.addGroupForm.addButton.id=add-group-btn
iot.device.groups.view.header.xpath=/html/body/div[3]/div[1]/div/span iot.device.groups.view.header.xpath=/html/body/div[3]/div[2]/div/h1[1]
iot.device.groups.add.emptyfrom.error=/html/body/div[3]/div/div[1]/div/span/strong #/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=group-grid

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId> <artifactId>wso2iot-integration</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId> <artifactId>wso2iot-integration</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId> <artifactId>wso2iot-integration</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -62,7 +62,7 @@
<property> <property>
<name>carbon.zip</name> <name>carbon.zip</name>
<value> <value>
${basedir}/../../distribution/target/wso2iots-${project.version}.zip ${basedir}/../../distribution/target/wso2iot-${project.version}.zip
</value> </value>
</property> </property>
<property> <property>
@ -131,7 +131,7 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iots</artifactId> <artifactId>wso2iot</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -171,7 +171,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iots-${project.version}/repository/resources/security/ ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/
</directory> </directory>
<includes> <includes>
<include>**/*.jks</include> <include>**/*.jks</include>
@ -192,7 +192,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iots-${project.version}/repository/resources/security/ ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/
</directory> </directory>
<includes> <includes>
<include>**/*.jks</include> <include>**/*.jks</include>
@ -213,7 +213,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2iots-${project.version}/repository/conf/axis2/ ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/conf/axis2/
</directory> </directory>
<includes> <includes>
<include>**/*.xml</include> <include>**/*.xml</include>

@ -69,12 +69,14 @@ public class Constants {
public static final String USER_NAME_ERROR = "Please enter a username"; public static final String USER_NAME_ERROR = "Please enter a username";
public static final String PASSWORD_ERROR = "Please provide a password"; public static final String PASSWORD_ERROR = "Please provide a password";
public static final String FAILED_ERROR = "Incorrect username or password.!"; public static final String FAILED_ERROR = "LOGIN\n"
+ "Login failed! Please recheck the username and password and try again.!\n" + "Username *\n"
+ "Password *\n" + "LOGIN\n" + "Create an account";
public static final String SHORT_PASSWORD_ERROR = "Your password must be at least 3 characters long"; public static final String SHORT_PASSWORD_ERROR = "Your password must be at least 3 characters long";
public static final String WRONG_USER_NAME = "admnnn"; public static final String WRONG_USER_NAME = "admnnn";
public static final String WRONG_USER_PASSWORD = "admmmm"; public static final String WRONG_USER_PASSWORD = "admmmm";
public static final String SHORT_PASSWORD = "ad"; public static final String SHORT_PASSWORD = "ad";
public static final String PAGE_TITLE = "Login | IoT Server"; public static final String PAGE_TITLE = "Login | CDMF";
} }

@ -0,0 +1,39 @@
package org.wso2.carbon.iot.integration.web.ui.test.error;
import junit.framework.Assert;
import org.openqa.selenium.WebDriver;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.wso2.carbon.automation.extensions.selenium.BrowserManager;
import org.wso2.carbon.iot.integration.web.ui.test.common.Constants;
import org.wso2.carbon.iot.integration.web.ui.test.common.IOTIntegrationUIBaseTestCase;
import org.wso2.iot.integration.ui.pages.error.IOTErrorPage;
import javax.xml.stream.XMLStreamException;
import javax.xml.xpath.XPathExpressionException;
import java.io.IOException;
public class InitialErrorTest extends IOTIntegrationUIBaseTestCase{
private WebDriver driver;
@BeforeClass(alwaysRun = true)
public void setup() throws XPathExpressionException, XMLStreamException, IOException {
super.init();
driver = BrowserManager.getWebDriver();
driver.get(getWebAppURL() + Constants.IOT_LOGIN_PATH);
}
@Test(description = "Test for initial login error.")
public void ErrorPageTest() throws IOException {
IOTErrorPage errorPage = new IOTErrorPage(driver);
Assert.assertTrue(errorPage.isErrorPresent());
}
@AfterClass(alwaysRun = true)
public void tearDown(){
driver.quit();
}
}

@ -0,0 +1,89 @@
/*
* 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.carbon.iot.integration.web.ui.test.extension;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.automation.engine.annotations.ExecutionEnvironment;
import org.wso2.carbon.automation.engine.context.AutomationContext;
import org.wso2.carbon.automation.engine.context.ContextXpathConstants;
import org.wso2.carbon.automation.engine.context.TestUserMode;
import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException;
import org.wso2.carbon.automation.engine.extensions.ExecutionListenerExtension;
import org.wso2.carbon.automation.extensions.ExtensionConstants;
import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension;
import javax.xml.xpath.XPathExpressionException;
/**
* Test Automation server extension to start the DAS.
* This will set the carbon_home to {carbonHome}/core and port offset : 2
*/
public class AnalyticsServerExtension extends ExecutionListenerExtension {
private CustomTestServerManager serverManager;
private static final Log log = LogFactory.getLog(CarbonServerExtension.class);
private String executionEnvironment;
private AutomationContext automationContext;
@Override
public void initiate() throws AutomationFrameworkException {
try {
automationContext = new AutomationContext("IOT", TestUserMode.SUPER_TENANT_USER);
if(getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) {
getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, "2");
}
serverManager = new CustomTestServerManager(getAutomationContext(), null, getParameters());
executionEnvironment =
automationContext.getConfigurationValue(ContextXpathConstants.EXECUTION_ENVIRONMENT);
} catch (XPathExpressionException e) {
handleException("Error while initiating test environment", e);
}
}
@Override
public void onExecutionStart() throws AutomationFrameworkException {
try {
if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
String carbonHome = serverManager.startServer("analytics");
log.info(carbonHome);
System.setProperty(ExtensionConstants.CARBON_HOME, carbonHome);
}
} catch (Exception e) {
handleException("Fail to start carbon server ", e);
}
}
@Override
public void onExecutionFinish() throws AutomationFrameworkException {
try {
if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
serverManager.stopServer();
}
} catch (Exception e) {
handleException("Fail to stop carbon server ", e);
}
}
private static void handleException(String msg, Exception e) {
log.error(msg, e);
throw new RuntimeException(msg, e);
}
}

@ -0,0 +1,89 @@
/*
* 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.carbon.iot.integration.web.ui.test.extension;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.automation.engine.annotations.ExecutionEnvironment;
import org.wso2.carbon.automation.engine.context.AutomationContext;
import org.wso2.carbon.automation.engine.context.ContextXpathConstants;
import org.wso2.carbon.automation.engine.context.TestUserMode;
import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException;
import org.wso2.carbon.automation.engine.extensions.ExecutionListenerExtension;
import org.wso2.carbon.automation.extensions.ExtensionConstants;
import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension;
import javax.xml.xpath.XPathExpressionException;
/**
* Test Automation server extension to start the Broker.
* This will set the carbon_home to {carbonHome}/core and port offset : 3
*/
public class BrokerServerExtension extends ExecutionListenerExtension {
private CustomTestServerManager serverManager;
private static final Log log = LogFactory.getLog(CarbonServerExtension.class);
private String executionEnvironment;
private AutomationContext automationContext;
@Override
public void initiate() throws AutomationFrameworkException {
try {
automationContext = new AutomationContext("IOT", TestUserMode.SUPER_TENANT_USER);
if(getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) {
getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, "3");
}
serverManager = new CustomTestServerManager(getAutomationContext(), null, getParameters());
executionEnvironment =
automationContext.getConfigurationValue(ContextXpathConstants.EXECUTION_ENVIRONMENT);
} catch (XPathExpressionException e) {
handleException("Error while initiating test environment", e);
}
}
@Override
public void onExecutionStart() throws AutomationFrameworkException {
try {
if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
String carbonHome = serverManager.startServer("broker");
log.info(carbonHome);
System.setProperty(ExtensionConstants.CARBON_HOME, carbonHome);
}
} catch (Exception e) {
handleException("Fail to start carbon server ", e);
}
}
@Override
public void onExecutionFinish() throws AutomationFrameworkException {
try {
if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
serverManager.stopServer();
}
} catch (Exception e) {
handleException("Fail to stop carbon server ", e);
}
}
private static void handleException(String msg, Exception e) {
log.error(msg, e);
throw new RuntimeException(msg, e);
}
}

@ -0,0 +1,147 @@
/*
* Copyright (c) 2005-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.carbon.iot.integration.web.ui.test.extension;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.automation.engine.FrameworkConstants;
import org.wso2.carbon.automation.engine.context.AutomationContext;
import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException;
import org.wso2.carbon.automation.extensions.ExtensionConstants;
import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerManager;
import javax.xml.xpath.XPathExpressionException;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
public class CustomTestServerManager {
protected CarbonServerManager carbonServer;
protected String carbonZip;
protected int portOffset;
protected Map<String, String> commandMap = new HashMap<String, String>();
private static final Log log = LogFactory.getLog(CustomTestServerManager.class);
protected String carbonHome;
public CustomTestServerManager(AutomationContext context) {
carbonServer = new CarbonServerManager(context);
}
public CustomTestServerManager(AutomationContext context, String carbonZip) {
carbonServer = new CarbonServerManager(context);
this.carbonZip = carbonZip;
}
public CustomTestServerManager(AutomationContext context, int portOffset) {
carbonServer = new CarbonServerManager(context);
this.portOffset = portOffset;
commandMap.put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, String.valueOf(portOffset));
}
public CustomTestServerManager(AutomationContext context, String carbonZip,
Map<String, String> commandMap) {
carbonServer = new CarbonServerManager(context);
this.carbonZip = carbonZip;
if (commandMap.get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) != null) {
this.portOffset = Integer.parseInt(commandMap.get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND));
} else {
throw new IllegalArgumentException("portOffset value must be set in command list");
}
this.commandMap = commandMap;
}
public String getCarbonZip() {
return carbonZip;
}
public String getCarbonHome() {
return carbonHome;
}
public int getPortOffset() {
return portOffset;
}
public void configureServer() throws AutomationFrameworkException {
}
public Map<String, String> getCommands() {
return commandMap;
}
/**
* This method is called for starting a Carbon server in preparation for execution of a
* TestSuite
* <p/>
* Add the @BeforeSuite TestNG annotation in the method overriding this method
* @param server : The server which needs to be start.
* @return The CARBON_HOME
* @throws java.io.IOException If an error occurs while copying the deployment artifacts into the
* Carbon server
*/
public String startServer(String server)
throws AutomationFrameworkException, IOException, XPathExpressionException {
if(carbonHome == null) {
if (carbonZip == null) {
carbonZip = System.getProperty(FrameworkConstants.SYSTEM_PROPERTY_CARBON_ZIP_LOCATION);
}
if (carbonZip == null) {
throw new IllegalArgumentException("carbon zip file cannot find in the given location");
}
carbonHome = carbonServer.setUpCarbonHome(carbonZip) + "/" + server;
configureServer();
}
log.info("Carbon Home - " + carbonHome );
if (commandMap.get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) != null) {
this.portOffset = Integer.parseInt(commandMap.get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND));
} else {
this.portOffset = 0;
}
carbonServer.startServerUsingCarbonHome(carbonHome, commandMap);
return carbonHome;
}
/**
* Restarting server already started by the method startServer
* @throws AutomationFrameworkException
*/
public void restartGracefully() throws AutomationFrameworkException {
if(carbonHome == null) {
throw new AutomationFrameworkException("No Running Server found to restart. " +
"Please make sure whether server is started");
}
carbonServer.restartGracefully();
}
/**
* This method is called for stopping a Carbon server
* <p/>
* Add the @AfterSuite annotation in the method overriding this method
*
* @throws AutomationFrameworkException If an error occurs while shutting down the server
*/
public void stopServer() throws AutomationFrameworkException {
carbonServer.serverShutdown(portOffset);
}
}

@ -0,0 +1,89 @@
/*
* 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.carbon.iot.integration.web.ui.test.extension;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.automation.engine.annotations.ExecutionEnvironment;
import org.wso2.carbon.automation.engine.context.AutomationContext;
import org.wso2.carbon.automation.engine.context.ContextXpathConstants;
import org.wso2.carbon.automation.engine.context.TestUserMode;
import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException;
import org.wso2.carbon.automation.engine.extensions.ExecutionListenerExtension;
import org.wso2.carbon.automation.extensions.ExtensionConstants;
import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension;
import javax.xml.xpath.XPathExpressionException;
/**
* Test Automation server extension to start the IOT core.
* This will set the carbon_home to {carbonHome}/core and port offset : 0
*/
public class IOTServerExtension extends ExecutionListenerExtension {
private CustomTestServerManager serverManager;
private static final Log log = LogFactory.getLog(CarbonServerExtension.class);
private String executionEnvironment;
private AutomationContext automationContext;
@Override
public void initiate() throws AutomationFrameworkException {
try {
automationContext = new AutomationContext("IOT", TestUserMode.SUPER_TENANT_USER);
if(getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) {
getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, "0");
}
serverManager = new CustomTestServerManager(getAutomationContext(), null, getParameters());
executionEnvironment =
automationContext.getConfigurationValue(ContextXpathConstants.EXECUTION_ENVIRONMENT);
} catch (XPathExpressionException e) {
handleException("Error while initiating test environment", e);
}
}
@Override
public void onExecutionStart() throws AutomationFrameworkException {
try {
if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
String carbonHome = serverManager.startServer("core");
log.info(carbonHome);
System.setProperty(ExtensionConstants.CARBON_HOME, carbonHome);
}
} catch (Exception e) {
handleException("Fail to start carbon server ", e);
}
}
@Override
public void onExecutionFinish() throws AutomationFrameworkException {
try {
if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) {
serverManager.stopServer();
}
} catch (Exception e) {
handleException("Fail to stop carbon server ", e);
}
}
private static void handleException(String msg, Exception e) {
log.error(msg, e);
throw new RuntimeException(msg, e);
}
}

@ -53,25 +53,6 @@ public class LoginFormValidationTest extends IOTIntegrationUIBaseTestCase {
clearForm(); clearForm();
} }
@Test(description = "Test for empty login form submission")
public void emptyLoginFormTest() throws Exception {
userNameField.sendKeys("");
passwordField.sendKeys("");
loginButton.click();
WebElement alertUserName = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.login.username.error")));
WebElement alertPassword = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.login.password.error")));
if (!alertUserName.isDisplayed()) Assert.assertTrue(false, "Alert for user name is not present.");
if (!alertPassword.isDisplayed()) Assert.assertTrue(false, "Alert for password is not present.");
Assert.assertEquals(alertUserName.getText(), Constants.User.Login.USER_NAME_ERROR);
Assert.assertEquals(alertPassword.getText(), Constants.User.Login.PASSWORD_ERROR);
}
@Test(description = "Test for incorrect username") @Test(description = "Test for incorrect username")
public void incorrectUserNameTest() throws Exception { public void incorrectUserNameTest() throws Exception {
clearForm(); clearForm();
@ -103,22 +84,6 @@ public class LoginFormValidationTest extends IOTIntegrationUIBaseTestCase {
} }
} }
@Test(description = "Test for short password")
public void shortPasswordTest() throws Exception {
clearForm();
userNameField.sendKeys(automationContext.getSuperTenant().getTenantAdmin().getUserName());
passwordField.sendKeys(Constants.User.Login.SHORT_PASSWORD);
loginButton.click();
WebElement alert = driver.findElement(By.id(uiElementMapper.getElement("iot.user.login.password.error")));
if (alert.isDisplayed()) {
Assert.assertEquals(alert.getText(), Constants.User.Login.SHORT_PASSWORD_ERROR);
} else {
Assert.assertTrue(false, Constants.ALERT_NOT_PRESENT);
}
}
public void clearForm() throws Exception { public void clearForm() throws Exception {
driver.get(getWebAppURL() + Constants.IOT_LOGIN_PATH); driver.get(getWebAppURL() + Constants.IOT_LOGIN_PATH);
uiElementMapper = UIElementMapper.getInstance(); uiElementMapper = UIElementMapper.getInstance();

@ -45,7 +45,7 @@ public class LoginTest extends IOTIntegrationUIBaseTestCase {
driver.get(getWebAppURL() + Constants.IOT_LOGIN_PATH); driver.get(getWebAppURL() + Constants.IOT_LOGIN_PATH);
} }
@Test(description = "Verify login to IOT server dashboard") @Test(description = "Verify logins to IOT server dashboard")
public void testAdminLogin() throws IOException, XPathExpressionException { public void testAdminLogin() throws IOException, XPathExpressionException {
LoginPage loginPage = new LoginPage(driver); LoginPage loginPage = new LoginPage(driver);
IOTAdminDashboard dashboard = loginPage.loginAsAdmin( IOTAdminDashboard dashboard = loginPage.loginAsAdmin(

@ -61,80 +61,50 @@ public class RegistrationFormValidationTest extends IOTIntegrationUIBaseTestCase
registerPage.validateForm("", "", "", "", "", ""); registerPage.validateForm("", "", "", "", "", "");
WebElement alertFirstName = driver.findElement(By.id( WebElement alertFirstName = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.register.firstname.error"))); uiElementMapper.getElement("iot.user.register.form.error")));
WebElement alertLastName = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.register.lastname.error")));
WebElement alertEmail = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.register.email.error")));
WebElement alertUserName = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.register.username.error")));
WebElement alertPassword = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.register.password.error")));
WebElement alertConfPassword = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.register.confirmPassword.error")));
if (!alertFirstName.isDisplayed()) { if (!alertFirstName.isDisplayed()) {
Assert.assertTrue(false, "Alert for first name is not displayed"); Assert.assertTrue(false, "Alert for first name is not displayed");
} }
if (!alertLastName.isDisplayed()) {
Assert.assertTrue(false, "Alert for last name is not displayed");
}
if (!alertEmail.isDisplayed()) {
Assert.assertTrue(false, "Alert for email is not displayed");
}
if (!alertUserName.isDisplayed()) {
Assert.assertTrue(false, "Alert for user name is not displayed");
}
if (!alertPassword.isDisplayed()) {
Assert.assertTrue(false, "Alert for password is not displayed");
}
if (!alertConfPassword.isDisplayed()) {
Assert.assertTrue(false, "Alert for confirm password is not displayed");
}
Assert.assertEquals(alertFirstName.getText(), "Firstname is a required field. This cannot be empty."); Assert.assertEquals(alertFirstName.getText(), "Firstname is a required field. It cannot be empty.");
Assert.assertEquals(alertLastName.getText(), "Lastname is a required field. This cannot be empty.");
Assert.assertEquals(alertEmail.getText(), "Email is a required field. This cannot be empty.");
Assert.assertEquals(alertUserName.getText(), "Username is a required field. This cannot be empty.");
Assert.assertEquals(alertPassword.getText(), "Please enter a user login password");
Assert.assertEquals(alertConfPassword.getText(), "Please enter a user login password");
} }
@Test(description = "Test for non matching passwords") @Test(description = "Test for non matching passwords")
public void nonMatchingPasswordTest() { public void nonMatchingPasswordTest() {
registerPage.validateForm("user", "user", "user@wso2.com", "user1", "password", "Password"); registerPage.validateForm("user", "user", "user@wso2.com", "user1", "password", "Password");
WebElement alertConfPassword = driver.findElement(By.id( WebElement alertConfPassword = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.register.confirmPassword.error"))); uiElementMapper.getElement("iot.user.register.form.error")));
if (!alertConfPassword.isDisplayed()) { if (!alertConfPassword.isDisplayed()) {
Assert.assertTrue(false, "Alert for confirm password is not displayed"); Assert.assertTrue(false, "Alert for confirm password is not displayed");
} }
Assert.assertEquals(alertConfPassword.getText(), "Please enter the same password as above"); Assert.assertEquals(alertConfPassword.getText(), "Please enter the same password for confirmation.");
} }
@Test(description = "Test for email") @Test(description = "Test for email")
public void incorrectEmailTest() { public void incorrectEmailTest() {
registerPage.validateForm("user", "user", "user123", "user1", "password", "password"); registerPage.validateForm("user", "user", "user123", "user1", "password", "password");
WebElement alertEmail = driver.findElement(By.id( WebElement alertEmail = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.register.email.error"))); uiElementMapper.getElement("iot.user.register.form.error")));
if (!alertEmail.isDisplayed()) { if (!alertEmail.isDisplayed()) {
Assert.assertTrue(false, "Alert for email is not displayed"); Assert.assertTrue(false, "Alert for email is not displayed");
} }
Assert.assertEquals(alertEmail.getText(), "Email is not valid. Please enter a correct email address."); Assert.assertEquals(alertEmail.getText(), "Provided email is invalid.");
} }
@Test(description = "Test for password length") @Test(description = "Test for password length")
public void passwordLengthTest() { public void passwordLengthTest() {
registerPage.validateForm("user", "user", "user@wso2.com", "user1", "pass", "pass"); registerPage.validateForm("user", "user", "user@wso2.com", "user1", "pass", "pass");
WebElement alertPassword = driver.findElement(By.id( WebElement alertPassword = driver.findElement(By.id(
uiElementMapper.getElement("iot.user.register.password.error"))); uiElementMapper.getElement("iot.user.register.form.error")));
if (!alertPassword.isDisplayed()) { if (!alertPassword.isDisplayed()) {
Assert.assertTrue(false, "Alert for password is not displayed"); Assert.assertTrue(false, "Alert for password is not displayed");
} }
Assert.assertEquals(alertPassword.getText(), "Password should be between 5 and 30 characters."); Assert.assertEquals(alertPassword.getText(), "Password is a required field. It cannot be empty.");
} }
@AfterClass(alwaysRun = true) @AfterClass(alwaysRun = true)

@ -24,7 +24,7 @@
<!-- <!--
Change this to edit wait time for test artifact deployment Change this to edit wait time for test artifact deployment
--> -->
<deploymentDelay>60000</deploymentDelay> <deploymentDelay>300000</deploymentDelay>
<!-- <!--
Change this to standalone|platform|all to execute test on specific environment Change this to standalone|platform|all to execute test on specific environment
--> -->
@ -172,7 +172,9 @@
</hosts> </hosts>
<ports> <ports>
<port type="http">9763</port> <port type="http">9763</port>
<port type="https">9446</port>
<port type="https">9443</port> <port type="https">9443</port>
<port type="https">9445</port>
</ports> </ports>
<properties> <properties>
@ -187,7 +189,9 @@
<platformExecutionManager> <platformExecutionManager>
<extentionClasses> <extentionClasses>
<class> <class>
<name>org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension</name> <name>org.wso2.carbon.iot.integration.web.ui.test.extension.BrokerServerExtension</name>
<name>org.wso2.carbon.iot.integration.web.ui.test.extension.IOTServerExtension</name>
<name>org.wso2.carbon.iot.integration.web.ui.test.extension.AnalyticsServerExtension</name>
<name>org.wso2.carbon.integration.common.extensions.usermgt.UserPopulateExtension</name> <name>org.wso2.carbon.integration.common.extensions.usermgt.UserPopulateExtension</name>
</class> </class>
</extentionClasses> </extentionClasses>

@ -26,13 +26,14 @@
</packages> </packages>
<classes> <classes>
<class name="org.wso2.carbon.iot.integration.web.ui.test.error.InitialErrorTest"/>
<class name="org.wso2.carbon.iot.integration.web.ui.test.login.LoginFormValidationTest"/> <class name="org.wso2.carbon.iot.integration.web.ui.test.login.LoginFormValidationTest"/>
<class name="org.wso2.carbon.iot.integration.web.ui.test.login.LoginTest"/> <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.RegistrationFormValidationTest"/>
<class name="org.wso2.carbon.iot.integration.web.ui.test.user.NewUserRegistrationTest"/> <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.SampleInstallationTest"/>

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId> <artifactId>wso2iot-integration</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId> <artifactId>wso2iot-integration</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

Loading…
Cancel
Save