ruwin
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'appm_improvement' into devicepercentageissue

Browse Source
appm_improvement
Kavin Prathaban 5 months ago
parent 128682ce77 4a9496f78a
commit c0729cfab2
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File

2
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/java/io/entgra/device/mgt/core/application/mgt/core/BaseTestCase.java
Unescape View File

@ -37,6 +37,7 @@ import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManag
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOFactory; import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOFactory;
import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHolder; import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHolder;
import io.entgra.device.mgt.core.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory; import io.entgra.device.mgt.core.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory;
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
import org.wso2.carbon.registry.core.config.RegistryContext; import org.wso2.carbon.registry.core.config.RegistryContext;
import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.registry.core.exceptions.RegistryException;
import org.wso2.carbon.registry.core.internal.RegistryDataHolder; import org.wso2.carbon.registry.core.internal.RegistryDataHolder;
@ -96,6 +97,7 @@ public abstract class BaseTestCase {
ConnectionManagerUtil.init(dataSource); ConnectionManagerUtil.init(dataSource);
DeviceManagementDAOFactory.init(dataSource); DeviceManagementDAOFactory.init(dataSource);
MetadataManagementDAOFactory.init(dataSource); MetadataManagementDAOFactory.init(dataSource);
OperationManagementDAOFactory.init(dataSource);
// PolicyManagementDAOFactory.init(dataSource); // PolicyManagementDAOFactory.init(dataSource);
// OperationManagementDAOFactory.init(dataSource); // OperationManagementDAOFactory.init(dataSource);
// GroupManagementDAOFactory.init(dataSource); // GroupManagementDAOFactory.init(dataSource);

2
components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/template/BaseExtensionsTest.java
Unescape View File

@ -18,6 +18,7 @@
package io.entgra.device.mgt.core.device.mgt.extensions.device.type.template; package io.entgra.device.mgt.core.device.mgt.extensions.device.type.template;
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
import org.apache.tomcat.jdbc.pool.PoolProperties; import org.apache.tomcat.jdbc.pool.PoolProperties;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.testng.annotations.BeforeSuite; import org.testng.annotations.BeforeSuite;
@ -131,6 +132,7 @@ public class BaseExtensionsTest {
readDataSourceConfig(datasourceLocation + DATASOURCE_EXT)); readDataSourceConfig(datasourceLocation + DATASOURCE_EXT));
DeviceManagementDAOFactory.init(dataSource); DeviceManagementDAOFactory.init(dataSource);
MetadataManagementDAOFactory.init(dataSource); MetadataManagementDAOFactory.init(dataSource);
OperationManagementDAOFactory.init(dataSource);
} }
protected DataSourceConfig readDataSourceConfig(String configLocation) throws DeviceManagementException { protected DataSourceConfig readDataSourceConfig(String configLocation) throws DeviceManagementException {

Write Preview
Loading…
Cancel
Save