Re-Enabling backend integration tests.

wso2 · Jan 24, 2017 · 0f18eb9 · 0f18eb9
1 parent 1015ca4
commit 0f18eb9
Show file tree

Hide file tree

Showing 138 changed files with 795 additions and 6,495 deletions.
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ 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
@@ -21,20 +21,19 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wso2iot-integration</artifactId>
-    <name>&gt;WSO2 IoT - Integration Tests</name>
+    <name>WSO2 IoT - Integration Tests</name>
     <packaging>pom</packaging>
 
     <modules>
         <module>tests-artifacts</module>
         <module>tests-common</module>
-        <!--<module>tests-integration</module>-->
-        <!--<module>tests-ui-integration</module>-->
+        <module>tests-integration</module>
         <module>tests-iot-web-ui</module>
     </modules>
 

diff --git a/modules/integration/tests-artifacts/pom.xml b/modules/integration/tests-artifacts/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-integration</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -36,6 +36,6 @@
             <name>Apache License Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
-    </licenses>    
+    </licenses>
 
 </project>
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-integration</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
diff --git a/...i-pages/src/main/java/org/wso2/iot/integration/ui/pages/EMMIntegrationUiBaseTestCase.java b/...i-pages/src/main/java/org/wso2/iot/integration/ui/pages/EMMIntegrationUiBaseTestCase.java
diff --git a/...-pages/src/main/java/org/wso2/iot/integration/ui/pages/Notification/NotificationView.java b/...-pages/src/main/java/org/wso2/iot/integration/ui/pages/Notification/NotificationView.java
diff --git a/...ests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java b/...ests-common/ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java