community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Making datasource and isMock parameters as optional, and passing the default params.

Browse Source
This commit is contained in:
sinthuja 2017-10-17 10:22:03 +05:30
parent b9131fa141
commit 635f84897d
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
View File

@ -139,7 +139,7 @@
<log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
</systemPropertyVariables>
<suiteXmlFiles>
<!--<file>src/test/resources/testng.xml</file>-->
<file>src/test/resources/testng.xml</file>
<file>src/test/resources/mysql-testng.xml</file>
</suiteXmlFiles>
</configuration>

5
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/BaseDeviceManagementTest.java
View File

@ -24,6 +24,7 @@ import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.tomcat.jdbc.pool.PoolProperties;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Optional;
import org.testng.annotations.Parameters;
import org.w3c.dom.Document;
import org.wso2.carbon.base.MultitenantConstants;
@ -68,7 +69,9 @@ public abstract class BaseDeviceManagementTest {
@BeforeSuite
@Parameters({"datasource", "isMock"})
public void setupDataSource(String datasource, boolean isMock) throws Exception {
public void setupDataSource(@Optional("src/test/resources/config/datasource/data-source-config") String datasource,
@Optional("false") boolean isMock)
throws Exception {
datasourceLocation = datasource;
mock = isMock;
this.initDataSource();

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/ApplicationPersistenceTests.java
View File

@ -56,10 +56,12 @@ public class ApplicationPersistenceTests extends BaseDeviceManagementTest {
Assert.fail(msg, e);
}
if (!isMock()) {
Assert.assertEquals(target.getApplicationIdentifier(), testAppIdentifier, "Application added is not as same as " +
"what's " +
"retrieved");
}
}
private Application getApplication(String appIdentifier, int tenantId) throws DeviceManagementDAOException {
Application application = null;

13
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/mysql-testng.xml
View File

@ -31,15 +31,16 @@
<class name="org.wso2.carbon.device.mgt.core.DeviceManagementRepositoryTests"/>
<class name="org.wso2.carbon.device.mgt.core.DeviceManagementConfigTests"/>
<class name="org.wso2.carbon.device.mgt.core.app.mgt.AppManagementConfigurationManagerTest"/>
<!--<class name="org.wso2.carbon.device.mgt.core.dao.ApplicationPersistenceTests"/>-->
<class name="org.wso2.carbon.device.mgt.core.dao.ApplicationPersistenceTests"/>
<class name="org.wso2.carbon.device.mgt.core.search.DeviceDetails"/>
<class name="org.wso2.carbon.device.mgt.core.dao.GroupPersistTests"/>
</classes>
</test>
<test name="Service Unit Tests" preserve-order="true">
<classes>
<class name="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceTest"/>
<!--TODO: Uncomment below once the tests are passing-->
<!--<test name="Service Unit Tests" preserve-order="true">-->
<!--<classes>-->
<!--<class name="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceTest"/>-->
<!--<class name="org.wso2.carbon.device.mgt.core.app.mgt.ApplicationManagementProviderServiceTest"/>-->
<!--<class name="org.wso2.carbon.device.mgt.core.service.GroupManagementProviderServiceTest"/>-->
<!--<class name="org.wso2.carbon.device.mgt.core.operation.OperationManagementTests"/>-->
@ -56,6 +57,6 @@
<!--<class name="org.wso2.carbon.device.mgt.core.search.SearchManagementServiceTest"/>-->
<!--<class name="org.wso2.carbon.device.mgt.core.search.ProcessorImplTest"/>-->
<!--<class name="org.wso2.carbon.device.mgt.core.search.SearchMgtUtilTest"/>-->
</classes>
</test>
<!--</classes>-->
<!--</test>-->
</suite>