mirror of
https://repository.entgra.net/community/product-iots.git
synced 2025-09-16 23:32:19 +00:00
Add sample build verification to integration testing
This commit is contained in:
charithag
parent
d7b18057df
commit
45881b32ee
@ -34,10 +34,6 @@
|
||||
<name>WSO2 IoT Server - Distribution</name>
|
||||
<description>WSO2 IoT Server Distribution</description>
|
||||
|
||||
<modules>
|
||||
<module>src/samples</module>
|
||||
</modules>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.h2database.wso2</groupId>
|
||||
@ -431,7 +427,7 @@
|
||||
<!--Copy samples to distribution-->
|
||||
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/samples"
|
||||
overwrite="true">
|
||||
<fileset dir="src/samples">
|
||||
<fileset dir="../samples">
|
||||
<exclude name="**/*.iml"/>
|
||||
<exclude name="**/.DS_Store"/>
|
||||
<exclude name="**/target/"/>
|
||||
|
||||
@ -37,23 +37,24 @@
|
||||
<module>tests-integration</module>
|
||||
<!--<module>tests-ui-integration</module>-->
|
||||
<module>tests-platform</module>
|
||||
<module>tests-samples</module>
|
||||
</modules>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<!--<plugin>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>2.4.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>auto-clean</id>
|
||||
<phase>initialize</phase>
|
||||
<goals>
|
||||
<goal>clean</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>-->
|
||||
</plugins>
|
||||
</build>
|
||||
<!--<build>-->
|
||||
<!--<plugins>-->
|
||||
<!--<plugin>-->
|
||||
<!--<artifactId>maven-clean-plugin</artifactId>-->
|
||||
<!--<version>2.4.1</version>-->
|
||||
<!--<executions>-->
|
||||
<!--<execution>-->
|
||||
<!--<id>auto-clean</id>-->
|
||||
<!--<phase>initialize</phase>-->
|
||||
<!--<goals>-->
|
||||
<!--<goal>clean</goal>-->
|
||||
<!--</goals>-->
|
||||
<!--</execution>-->
|
||||
<!--</executions>-->
|
||||
<!--</plugin>-->
|
||||
<!--</plugins>-->
|
||||
<!--</build>-->
|
||||
</project>
|
||||
|
||||
@ -16,7 +16,8 @@
|
||||
~ under the License.
|
||||
-->
|
||||
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
|
||||
<parent>
|
||||
<groupId>org.wso2.iot</groupId>
|
||||
@ -26,12 +27,8 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.wso2.iot</groupId>
|
||||
<artifactId>tests-artifacts</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 IoT Server Integration Test Common</name>
|
||||
|
||||
<modules>
|
||||
</modules>
|
||||
<name>WSO2 IoT Server - Integration Test Artifacts</name>
|
||||
|
||||
</project>
|
||||
|
||||
@ -27,8 +27,8 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.wso2.iot</groupId>
|
||||
<artifactId>org.wso2.carbon.iot.integration.common.clients</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>WSO2 MDM - Integration Admin Clients</name>
|
||||
<name>WSO2 IoT Server - Integration Test Common Admin Clients</name>
|
||||
|
||||
</project>
|
||||
|
||||
@ -28,9 +28,8 @@
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.iot.integration.common.utils</artifactId>
|
||||
<groupId>org.wso2.iot</groupId>
|
||||
<packaging>jar</packaging>
|
||||
<name>WSO2 IoT Server - Integration Test Utils</name>
|
||||
<name>WSO2 IoT Server - Integration Test Common Utils</name>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
|
||||
@ -26,10 +26,9 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.wso2.iot</groupId>
|
||||
<artifactId>tests-common</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 IoT Server Integration Test Common</name>
|
||||
<name>WSO2 IoT Server - Integration Test Common</name>
|
||||
|
||||
<modules>
|
||||
<module>admin-clients</module>
|
||||
|
||||
@ -29,10 +29,9 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.wso2.iot</groupId>
|
||||
<artifactId>org.wso2.carbon.iot.integration.ui.pages</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>WSO2 MDM - Integration Test UI Pages</name>
|
||||
<name>WSO2 IoT Server - Integration Test Common UI Pages</name>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
*under the License.
|
||||
*/
|
||||
|
||||
package org.wso2.emm.integration.ui.pages;
|
||||
package org.wso2.carbon.iot.integration.ui.pages;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
@ -31,13 +31,13 @@ import javax.xml.xpath.XPathExpressionException;
|
||||
import java.io.IOException;
|
||||
import java.rmi.RemoteException;
|
||||
|
||||
public class EMMIntegrationUiBaseTestCase {
|
||||
public class IntegrationUiBaseTestCase {
|
||||
|
||||
private static final Log log = LogFactory.getLog(EMMIntegrationUiBaseTestCase.class);
|
||||
private static final Log log = LogFactory.getLog(IntegrationUiBaseTestCase.class);
|
||||
protected AutomationContext automationContext;
|
||||
|
||||
protected void init() throws IOException, XMLStreamException, XPathExpressionException {
|
||||
automationContext = new AutomationContext("EMM", "emm001", TestUserMode.SUPER_TENANT_ADMIN);
|
||||
automationContext = new AutomationContext("IoTServer", "IoT001", TestUserMode.SUPER_TENANT_ADMIN);
|
||||
}
|
||||
|
||||
protected String getBackendURL() throws XPathExpressionException {
|
||||
@ -16,7 +16,7 @@
|
||||
*under the License.
|
||||
*/
|
||||
|
||||
package org.wso2.emm.integration.ui.pages;
|
||||
package org.wso2.carbon.iot.integration.ui.pages;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
@ -16,16 +16,16 @@
|
||||
*under the License.
|
||||
*/
|
||||
|
||||
package org.wso2.emm.integration.ui.pages.home;
|
||||
package org.wso2.carbon.iot.integration.ui.pages.home;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.openqa.selenium.By;
|
||||
import org.openqa.selenium.WebDriver;
|
||||
import org.wso2.emm.integration.ui.pages.UIElementMapper;
|
||||
import org.wso2.carbon.iot.integration.ui.pages.UIElementMapper;
|
||||
import org.wso2.carbon.iot.integration.ui.pages.login.LoginPage;
|
||||
|
||||
import java.io.IOException;
|
||||
import org.wso2.emm.integration.ui.pages.login.LoginPage;
|
||||
|
||||
/**
|
||||
* Home page class holds the information of product page you got once login
|
||||
@ -16,17 +16,17 @@
|
||||
*under the License.
|
||||
*/
|
||||
|
||||
package org.wso2.emm.integration.ui.pages.login;
|
||||
package org.wso2.carbon.iot.integration.ui.pages.login;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.openqa.selenium.By;
|
||||
import org.openqa.selenium.WebDriver;
|
||||
import org.openqa.selenium.WebElement;
|
||||
import org.wso2.emm.integration.ui.pages.UIElementMapper;
|
||||
import org.wso2.carbon.iot.integration.ui.pages.UIElementMapper;
|
||||
|
||||
import java.io.IOException;
|
||||
import org.wso2.emm.integration.ui.pages.home.HomePage;
|
||||
import org.wso2.carbon.iot.integration.ui.pages.home.HomePage;
|
||||
|
||||
/**
|
||||
* Login page class - contains methods to login to wso2 products.
|
||||
@ -26,12 +26,8 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.wso2.iot</groupId>
|
||||
<artifactId>tests-integration</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 IoT Server Integration Tests</name>
|
||||
|
||||
<modules>
|
||||
</modules>
|
||||
<name>WSO2 IoT Server - Integration Test</name>
|
||||
|
||||
</project>
|
||||
|
||||
@ -26,12 +26,8 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.wso2.iot</groupId>
|
||||
<artifactId>tests-platform</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 IoT Server Integration Tests</name>
|
||||
|
||||
<modules>
|
||||
</modules>
|
||||
<name>WSO2 IoT Server - Integration Test Platform</name>
|
||||
|
||||
</project>
|
||||
|
||||
38
modules/integration/tests-samples/pom.xml
Normal file
38
modules/integration/tests-samples/pom.xml
Normal file
@ -0,0 +1,38 @@
|
||||
<!--
|
||||
~ Copyright (c) 2014, 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.
|
||||
-->
|
||||
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
|
||||
<parent>
|
||||
<groupId>org.wso2.iot</groupId>
|
||||
<artifactId>wso2iot-integration</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>tests-samples</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 IoT Server - Integration Test Samples</name>
|
||||
|
||||
<modules>
|
||||
<module>../../samples</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
@ -1,4 +1,4 @@
|
||||
<project name="Arduino" basedir="." default="deploy">
|
||||
<project name="Arduino" basedir="" default="deploy">
|
||||
|
||||
<import file="../common.xml"/>
|
||||
|
||||
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 6.3 KiB |
@ -1,4 +1,4 @@
|
||||
<project name="Arduino" basedir="." default="deploy">
|
||||
<project name="Arduino" basedir="" default="deploy">
|
||||
|
||||
<import file="../common.xml"/>
|
||||
|
||||
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
@ -1,9 +1,9 @@
|
||||
<project name="IoTServerSamples" basedir="." default="deploy">
|
||||
<project name="IoTServerSamples" basedir="" default="deploy">
|
||||
<macrodef name="iterate">
|
||||
<attribute name="target"/>
|
||||
<sequential>
|
||||
<subant target="@{target}">
|
||||
<fileset dir="." includes="*/build.xml"/>
|
||||
<fileset dir="" includes="*/build.xml"/>
|
||||
</subant>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
@ -1,4 +1,4 @@
|
||||
<project name="DigitalDisplay" basedir="." default="deploy">
|
||||
<project name="DigitalDisplay" basedir="" default="deploy">
|
||||
|
||||
<import file="../common.xml"/>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user