community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0

Browse Source
This commit is contained in:
ayyoob 2017-01-10 03:32:41 +05:30
commit 9f366902b1
18 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/distribution/src/resources/plugins/plugins-deployer.xml
View File

@ -52,22 +52,22 @@
<publishArtifactRepository>true</publishArtifactRepository> <publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts> <featureArtifacts>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:/${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:/${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:/${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:/${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:/${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:/${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>

2
modules/integration/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
modules/integration/tests-artifacts/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/integration/tests-common/admin-clients/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/integration/tests-common/integration-test-utils/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/integration/tests-common/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/integration/tests-common/ui-pages/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/integration/tests-common/web-ui-pages/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

7
modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java
View File

@ -41,8 +41,7 @@ public class DeviceGroupsPage {
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.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"); 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. * @return : True if the group is visible. False otherwise.
*/ */
public boolean isGroupCreated(String groupName) { 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) { for (WebElement name : allGroupNames) {
if (name.getText().contains(groupName)){ if (name.getText().contains(groupName)){

2
modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java
View File

@ -41,7 +41,7 @@ public class AddUserPage {
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("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"); throw new IllegalStateException("This is not the Add User page");
} }
} }

14
modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties
View File

@ -23,6 +23,7 @@ cdmf.register.page=Register | CDMF
cdmf.error.page=Error | CDMF cdmf.error.page=Error | CDMF
cdmf.user.home.page=Device Management | CDMF cdmf.user.home.page=Device Management | CDMF
cdmf.groups.page=Group Management | CDMF cdmf.groups.page=Group Management | CDMF
cdmf.user.add.page=User Management | Add User | CDMF
# User registration and login details----------------------------------------------------------------------------------- # 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 #/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.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 -------------------------------------------------------------------------------------------------------------- #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.added.page.subtitle.xpath="//p[@class='page-sub-title']"
iot.admin.user.listing.page.subtitle.xpath="//span[@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.add.btn.xpath=//*[@id="add-user-btn"]
iot.admin.addUser.view.btn.xpath=//*[@id="user-created-msg"]/div/button 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"] iot.admin.addUser.formError.xpath=//*[@id="user-create-error-msg"]
#----- User view page heading ------------------------------------------------------------------------------------------ #----- User view page heading ------------------------------------------------------------------------------------------

2
modules/integration/tests-integration-old/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/integration/tests-integration/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

7
modules/integration/tests-iot-web-ui/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -48,9 +48,9 @@
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile> <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
</suiteXmlFiles> </suiteXmlFiles>
<skipTests>${skipTests}</skipTests>
<systemProperties> <systemProperties>
<skipTests>true</skipTests>
<property> <property>
<name>maven.test.haltafterfailure</name> <name>maven.test.haltafterfailure</name>
<value>false</value> <value>false</value>
@ -267,5 +267,8 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties>
<skipTests>true</skipTests>
</properties>
</project> </project>

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

@ -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.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"/>
<class name="org.wso2.carbon.iot.integration.web.ui.test.samples.SampleInstallationVerification"/> <class name="org.wso2.carbon.iot.integration.web.ui.test.samples.SampleInstallationVerification"/>

2
modules/integration/tests-platform/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/integration/tests-ui-integration/pom.xml
View File

@ -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>3.0.1-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

3
pom.xml
View File

@ -39,6 +39,7 @@
<module>modules/core</module> <module>modules/core</module>
<module>modules/analytics</module> <module>modules/analytics</module>
<module>modules/distribution</module> <module>modules/distribution</module>
<module>modules/integration</module>
</modules> </modules>
<dependencyManagement> <dependencyManagement>
@ -1104,7 +1105,7 @@
<artifactId>selenium-android-driver</artifactId> <artifactId>selenium-android-driver</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
<scope>test</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.opera</groupId> <groupId>com.opera</groupId>