Merge branch 'master' of github.com:wso2/product-mdm

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml

@@ -124,5 +124,10 @@
             <groupId>org.apache.tomcat.wso2</groupId>
             <artifactId>jdbc-pool</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.h2database.wso2</groupId>
+            <artifactId>h2-database-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/common/TestDBConfigurations.java

@@ -22,12 +22,12 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 
-@XmlRootElement(name = "DeviceMgtTestDBConfigurations")
+@XmlRootElement(name = "TestDataSourceConfigurations")
 public class TestDBConfigurations {
 
     private List<TestDBConfiguration> dbTypesList;
 
-    @XmlElement(name = "DBType")
+    @XmlElement(name = "Type")
     public List<TestDBConfiguration> getDbTypesList() {
         return dbTypesList;
     }

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileFeatureDAOTestSuite.java

@@ -112,12 +112,16 @@ public class MobileFeatureDAOTestSuite {
     }
 
     private void createH2DB(TestDBConfiguration testDBConf) throws Exception {
-        Class.forName(testDBConf.getDriverClassName());
+        try {
-        conn = DriverManager.getConnection(testDBConf.getConnectionURL());
+            Class.forName(testDBConf.getDriverClassName());
-        stmt = conn.createStatement();
+            conn = DriverManager.getConnection(testDBConf.getConnectionURL());
-        stmt.executeUpdate("RUNSCRIPT FROM './src/test/resources/sql/CreateH2TestDB.sql'");
+            stmt = conn.createStatement();
-        stmt.close();
+            stmt.executeUpdate("RUNSCRIPT FROM './src/test/resources/sql/CreateH2TestDB.sql'");
-        conn.close();
+        } finally {
+            stmt.close();
+            conn.close();
+            TestUtils.cleanupResources(conn, stmt, null);
+        }
     }
 
     @Test