community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dulitha Wijewantha 2015-01-27 12:33:00 +05:30
commit ccd778160f
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -112,12 +112,16 @@ public class MobileFeatureDAOTestSuite {
} }
private void createH2DB(TestDBConfiguration testDBConf) throws Exception { 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 @Test