Merge pull request #280 from menakaj/master

Enabled integration tests in build.
application-manager-new
Ruwan 8 years ago committed by GitHub
commit 966dd41d4a

@ -31,8 +31,6 @@
<description>Backend Integration Tests for WSO2 IOT Server.</description>
<packaging>jar</packaging>
<build>
<plugins>
<plugin>
@ -46,7 +44,7 @@
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
</suiteXmlFiles>
<skipTests>${skipTests}</skipTests>
<!--<skipTests>${skipTests}</skipTests>-->
<systemProperties>
<property>
@ -247,10 +245,6 @@
</build>
<dependencies>
<dependency>
<groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.automation</groupId>
<artifactId>org.wso2.carbon.automation.engine</artifactId>
@ -269,8 +263,8 @@
</dependency>
</dependencies>
<properties>
<skipTests>true</skipTests>
</properties>
<!--<properties>-->
<!--<skipTests>true</skipTests>-->
<!--</properties>-->
</project>

@ -144,7 +144,7 @@ public final class Constants {
}
public static final class AndroidOperations {
private final String PAYLOAD_COMMON = "["+DEVICE_ID+"]";
private static final String PAYLOAD_COMMON = "["+DEVICE_ID+"]";
public static final String OPERATION_PAYLOAD_FILE_NAME = "android-operation-payloads.json";
public static final String OPERATIONS_GROUP = "operations";

@ -250,6 +250,7 @@
<dependency>
<groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
<version>${product.iot.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.automation</groupId>

@ -297,12 +297,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
<version>${product.iot.version}</version>
<scope>test</scope>
</dependency>
<!--Carbon Kernel Dependencies-->
<dependency>
@ -1547,7 +1541,7 @@
<product.iot.version>3.1.0-SNAPSHOT</product.iot.version>
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.8</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>3.0.9</carbon.device.mgt.plugin.version>
<!-- API Management -->
<carbon.api.mgt.version>6.1.35</carbon.api.mgt.version>

Loading…
Cancel
Save