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

Device DAO unit tests implementation

Browse Source
This commit is contained in:
manoj 2014-12-12 19:55:41 +05:30
parent 6a86ab43c1
commit 10a05b024f
7 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,11 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version> <version>2.18</version>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
</plugin> </plugin>
</plugins> </plugins>

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java
View File

@ -61,10 +61,10 @@ public class DeviceDAOImpl implements DeviceDAO {
stmt.setLong(4, new Date().getTime()); stmt.setLong(4, new Date().getTime());
stmt.setString(5, device.getOwnerShip()); stmt.setString(5, device.getOwnerShip());
stmt.setString(6, device.getStatus().toString()); stmt.setString(6, device.getStatus().toString());
stmt.setString(7, device.getDeviceType()); stmt.setInt(7, device.getDeviceType());
stmt.setString(8, device.getDeviceIdentificationId()); stmt.setString(8, device.getDeviceIdentificationId());
stmt.setString(9, device.getOwnerId()); stmt.setString(9, device.getOwnerId());
stmt.setInt(10, DeviceManagementDAOUtil.getTenantId()); stmt.setInt(10, device.getTenantId());
stmt.executeUpdate(); stmt.executeUpdate();
} catch (SQLException e) { } catch (SQLException e) {
String msg = "Error occurred while enrolling device '" + device.getName() + "'"; String msg = "Error occurred while enrolling device '" + device.getName() + "'";

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java
View File

@ -113,7 +113,7 @@ public final class DeviceManagementDAOUtil {
deviceBO.setOwnerId(device.getOwner()); deviceBO.setOwnerId(device.getOwner());
deviceBO.setOwnerShip(device.getOwnership()); deviceBO.setOwnerShip(device.getOwnership());
deviceBO.setTenantId(DeviceManagementDAOUtil.getTenantId()); deviceBO.setTenantId(DeviceManagementDAOUtil.getTenantId());
deviceBO.setDeviceType(device.getType()); deviceBO.setDeviceType(Integer.parseInt(device.getType()));
return deviceBO; return deviceBO;
} }

6
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/Device.java
View File

@ -33,13 +33,13 @@ public class Device implements Serializable {
private String ownerId; private String ownerId;
private String ownerShip; private String ownerShip;
private int tenantId; private int tenantId;
private String deviceType; private Integer deviceType;
public String getDeviceType() { public Integer getDeviceType() {
return deviceType; return deviceType;
} }
public void setDeviceType(String deviceType) { public void setDeviceType(Integer deviceType) {
this.deviceType = deviceType; this.deviceType = deviceType;
} }

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

@ -47,6 +47,7 @@ public class TestDBConfiguration {
public void setConnectionUrl(String connectionUrl) { public void setConnectionUrl(String connectionUrl) {
this.connectionUrl = connectionUrl; this.connectionUrl = connectionUrl;
} }
@XmlElement(name = "driverclass", nillable = false) @XmlElement(name = "driverclass", nillable = false)
public String getDriverClass() { public String getDriverClass() {
return driverClass; return driverClass;

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

@ -27,6 +27,7 @@ import org.wso2.carbon.device.mgt.core.common.TestDBConfiguration;
import org.wso2.carbon.device.mgt.core.common.TestDBConfigurations; import org.wso2.carbon.device.mgt.core.common.TestDBConfigurations;
import org.wso2.carbon.device.mgt.core.dto.Device; import org.wso2.carbon.device.mgt.core.dto.Device;
import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.core.dto.DeviceType;
import org.wso2.carbon.device.mgt.core.dto.OwnerShip;
import org.wso2.carbon.device.mgt.core.dto.Status; import org.wso2.carbon.device.mgt.core.dto.Status;
import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
@ -146,8 +147,10 @@ public class DeviceMgtDAOTestSuite {
device.setDescription("test description"); device.setDescription("test description");
device.setStatus(Status.ACTIVE); device.setStatus(Status.ACTIVE);
device.setDeviceIdentificationId("111"); device.setDeviceIdentificationId("111");
device.setDeviceType(devType.getId().toString()); device.setDeviceType(devType.getId().intValue());
device.setOwnerShip(OwnerShip.BYOD.toString());
device.setOwnerId("111"); device.setOwnerId("111");
device.setTenantId(-1234);
deviceMgtDAO.addDevice(device); deviceMgtDAO.addDevice(device);
Long deviceId = null; Long deviceId = null;

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/CreateH2TestDB.sql
View File

@ -10,8 +10,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE
ID INT auto_increment NOT NULL, ID INT auto_increment NOT NULL,
DESCRIPTION TEXT NULL DEFAULT NULL, DESCRIPTION TEXT NULL DEFAULT NULL,
NAME VARCHAR(100) NULL DEFAULT NULL, NAME VARCHAR(100) NULL DEFAULT NULL,
DATE_OF_ENROLLMENT INTEGER NULL DEFAULT NULL, DATE_OF_ENROLLMENT BIGINT NULL DEFAULT NULL,
DATE_OF_LAST_UPDATE INTEGER NULL DEFAULT NULL, DATE_OF_LAST_UPDATE BIGINT NULL DEFAULT NULL,
OWNERSHIP VARCHAR(45) NULL DEFAULT NULL, OWNERSHIP VARCHAR(45) NULL DEFAULT NULL,
STATUS VARCHAR(15) NULL DEFAULT NULL, STATUS VARCHAR(15) NULL DEFAULT NULL,
DEVICE_TYPE_ID INT(11) NULL DEFAULT NULL, DEVICE_TYPE_ID INT(11) NULL DEFAULT NULL,