diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml index 1f219c7791..9371b178de 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml @@ -53,21 +53,27 @@ ${project.artifactId} ${project.artifactId} ${carbon.mobile.device.mgt.version} - Device Management Mobile Impl Bundle - - - org.wso2.carbon.device.mgt.mobile.internal - + Device Management Mobile Impl Bundle + org.wso2.carbon.device.mgt.mobile.internal org.osgi.framework, org.osgi.service.component, org.apache.commons.logging, + javax.xml.bind.*, + javax.naming, + javax.sql, + javax.xml.bind.annotation, + javax.xml.parsers, + org.w3c.dom, + org.wso2.carbon.core, + org.wso2.carbon.utils.*, + org.wso2.carbon.device.mgt.common.*, + org.wso2.carbon.apimgt.*; !org.wso2.carbon.device.mgt.mobile.internal, - org.wso2.carbon.device.mgt.mobile.* + org.wso2.carbon.device.mgt.mobile.*, - * diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileDeviceDAOImpl.java index 1c882515f5..a74e4b3833 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileDeviceDAOImpl.java @@ -53,15 +53,16 @@ public class MobileDeviceDAOImpl implements MobileDeviceDAO { try { conn = this.getConnection(); String selectDBQuery = - "SELECT MOBILE_DEVICE_ID, REG_ID, IMEI, IMSI, OS_VERSION,DEVICE_MODEL, VENDOR, " + - "LATITUDE, LONGITUDE FROM MBL_DEVICE WHERE MOBILE_DEVICE_ID = ?"; + "SELECT MOBILE_DEVICE_ID, PUSH_TOKEN, IMEI, IMSI, OS_VERSION,DEVICE_MODEL, VENDOR, " + + "LATITUDE, LONGITUDE, CHALLENGE, SERIAL, TOKEN, UNLOCK_TOKEN FROM MBL_DEVICE" + + " WHERE MOBILE_DEVICE_ID = ?"; stmt = conn.prepareStatement(selectDBQuery); stmt.setString(1, mblDeviceId); ResultSet resultSet = stmt.executeQuery(); if (resultSet.next()) { mobileDevice = new MobileDevice(); mobileDevice.setMobileDeviceId(resultSet.getString(1)); - mobileDevice.setRegId(resultSet.getString(2)); + mobileDevice.setPushToken(resultSet.getString(2)); mobileDevice.setImei(resultSet.getString(3)); mobileDevice.setImsi(resultSet.getString(4)); mobileDevice.setOsVersion(resultSet.getString(5)); @@ -69,6 +70,10 @@ public class MobileDeviceDAOImpl implements MobileDeviceDAO { mobileDevice.setVendor(resultSet.getString(7)); mobileDevice.setLatitude(resultSet.getString(8)); mobileDevice.setLongitude(resultSet.getString(9)); + mobileDevice.setChallenge(resultSet.getString(10)); + mobileDevice.setSerial(resultSet.getString(11)); + mobileDevice.setToken(resultSet.getString(12)); + mobileDevice.setUnlockToken(resultSet.getString(13)); if (log.isDebugEnabled()) { log.debug("Mobile device " + mblDeviceId + " data has fetched from MDM database."); } @@ -93,12 +98,13 @@ public class MobileDeviceDAOImpl implements MobileDeviceDAO { try { conn = this.getConnection(); String createDBQuery = - "INSERT INTO MBL_DEVICE(MOBILE_DEVICE_ID, REG_ID, IMEI, IMSI, OS_VERSION," + - "DEVICE_MODEL, VENDOR, LATITUDE, LONGITUDE) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"; + "INSERT INTO MBL_DEVICE(MOBILE_DEVICE_ID, PUSH_TOKEN, IMEI, IMSI, OS_VERSION," + + "DEVICE_MODEL, VENDOR, LATITUDE, LONGITUDE, CHALLENGE, SERIAL, TOKEN, " + + "UNLOCK_TOKEN) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; stmt = conn.prepareStatement(createDBQuery); stmt.setString(1, mobileDevice.getMobileDeviceId()); - stmt.setString(2, mobileDevice.getRegId()); + stmt.setString(2, mobileDevice.getPushToken()); stmt.setString(3, mobileDevice.getImei()); stmt.setString(4, mobileDevice.getImsi()); stmt.setString(5, mobileDevice.getOsVersion()); @@ -106,6 +112,10 @@ public class MobileDeviceDAOImpl implements MobileDeviceDAO { stmt.setString(7, mobileDevice.getVendor()); stmt.setString(8, mobileDevice.getLatitude()); stmt.setString(9, mobileDevice.getLongitude()); + stmt.setString(10, mobileDevice.getChallenge()); + stmt.setString(11, mobileDevice.getSerial()); + stmt.setString(12, mobileDevice.getToken()); + stmt.setString(13, mobileDevice.getUnlockToken()); int rows = stmt.executeUpdate(); if (rows > 0) { status = true; @@ -134,11 +144,11 @@ public class MobileDeviceDAOImpl implements MobileDeviceDAO { try { conn = this.getConnection(); String updateDBQuery = - "UPDATE MBL_DEVICE SET REG_ID = ?, IMEI = ?, IMSI = ?, OS_VERSION = ?," + - "DEVICE_MODEL = ?, VENDOR = ? , LATITUDE = ?, LONGITUDE = ? " + - "WHERE MOBILE_DEVICE_ID = ?"; + "UPDATE MBL_DEVICE SET PUSH_TOKEN = ?, IMEI = ?, IMSI = ?, OS_VERSION = ?," + + "DEVICE_MODEL = ?, VENDOR = ? , LATITUDE = ?, LONGITUDE = ?, CHALLENGE = ?," + + "SERIAL = ?, TOKEN = ?, UNLOCK_TOKEN = ? WHERE MOBILE_DEVICE_ID = ?"; stmt = conn.prepareStatement(updateDBQuery); - stmt.setString(1, mobileDevice.getRegId()); + stmt.setString(1, mobileDevice.getPushToken()); stmt.setString(2, mobileDevice.getImei()); stmt.setString(3, mobileDevice.getImsi()); stmt.setString(4, mobileDevice.getOsVersion()); @@ -146,7 +156,11 @@ public class MobileDeviceDAOImpl implements MobileDeviceDAO { stmt.setString(6, mobileDevice.getVendor()); stmt.setString(7, mobileDevice.getLatitude()); stmt.setString(8, mobileDevice.getLongitude()); - stmt.setString(9, mobileDevice.getMobileDeviceId()); + stmt.setString(9, mobileDevice.getChallenge()); + stmt.setString(10, mobileDevice.getSerial()); + stmt.setString(11, mobileDevice.getToken()); + stmt.setString(12, mobileDevice.getUnlockToken()); + stmt.setString(13, mobileDevice.getMobileDeviceId()); int rows = stmt.executeUpdate(); if (rows > 0) { status = true; @@ -204,14 +218,14 @@ public class MobileDeviceDAOImpl implements MobileDeviceDAO { try { conn = this.getConnection(); String selectDBQuery = - "SELECT MOBILE_DEVICE_ID, REG_ID, IMEI, IMSI, OS_VERSION,DEVICE_MODEL, VENDOR," + - "LATITUDE, LONGITUDE FROM MBL_DEVICE"; + "SELECT MOBILE_DEVICE_ID, PUSH_TOKEN, IMEI, IMSI, OS_VERSION,DEVICE_MODEL, VENDOR," + + "LATITUDE, LONGITUDE, CHALLENGE, SERIAL, TOKEN, UNLOCK_TOKEN FROM MBL_DEVICE"; stmt = conn.prepareStatement(selectDBQuery); ResultSet resultSet = stmt.executeQuery(); while (resultSet.next()) { mobileDevice = new MobileDevice(); mobileDevice.setMobileDeviceId(resultSet.getString(1)); - mobileDevice.setRegId(resultSet.getString(2)); + mobileDevice.setPushToken(resultSet.getString(2)); mobileDevice.setImei(resultSet.getString(3)); mobileDevice.setImsi(resultSet.getString(4)); mobileDevice.setOsVersion(resultSet.getString(5)); @@ -219,6 +233,10 @@ public class MobileDeviceDAOImpl implements MobileDeviceDAO { mobileDevice.setVendor(resultSet.getString(7)); mobileDevice.setLatitude(resultSet.getString(8)); mobileDevice.setLongitude(resultSet.getString(9)); + mobileDevice.setChallenge(resultSet.getString(10)); + mobileDevice.setSerial(resultSet.getString(11)); + mobileDevice.setToken(resultSet.getString(12)); + mobileDevice.setUnlockToken(resultSet.getString(13)); mobileDevices.add(mobileDevice); } if (log.isDebugEnabled()) { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java index b05a624e3d..fab7845a12 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java @@ -26,7 +26,7 @@ import java.io.Serializable; public class MobileDevice implements Serializable { private String mobileDeviceId; - private String regId; + private String pushToken; private String imei; private String imsi; private String osVersion; @@ -34,6 +34,42 @@ public class MobileDevice implements Serializable { private String vendor; private String latitude; private String longitude; + private String serial; + private String unlockToken; + private String token; + private String challenge; + + public String getUnlockToken() { + return unlockToken; + } + + public void setUnlockToken(String unlockToken) { + this.unlockToken = unlockToken; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public String getChallenge() { + return challenge; + } + + public void setChallenge(String challenge) { + this.challenge = challenge; + } + + public String getSerial() { + return serial; + } + + public void setSerial(String serial) { + this.serial = serial; + } public String getMobileDeviceId() { return mobileDeviceId; @@ -43,12 +79,12 @@ public class MobileDevice implements Serializable { this.mobileDeviceId = mobileDeviceId; } - public String getRegId() { - return regId; + public String getPushToken() { + return pushToken; } - public void setRegId(String regId) { - this.regId = regId; + public void setPushToken(String pushToken) { + this.pushToken = pushToken; } public String getImei() { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java index 66fa5900df..952e40b4fb 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java @@ -42,12 +42,16 @@ public class MobileDeviceManagementUtil { private static final Log log = LogFactory.getLog(MobileDeviceManagementUtil.class); private static final String MOBILE_DEVICE_IMEI = "imei"; private static final String MOBILE_DEVICE_IMSI = "imsi"; - private static final String MOBILE_DEVICE_REG_ID = "regId"; + private static final String MOBILE_DEVICE_PUSH_TOKEN = "pushToken"; private static final String MOBILE_DEVICE_VENDOR = "vendor"; private static final String MOBILE_DEVICE_OS_VERSION = "osVersion"; private static final String MOBILE_DEVICE_MODEL = "model"; private static final String MOBILE_DEVICE_LATITUDE = "latitude"; private static final String MOBILE_DEVICE_LONGITUDE = "longitude"; + private static final String MOBILE_DEVICE_TOKEN = "token"; + private static final String MOBILE_DEVICE_SERIAL = "serial"; + private static final String MOBILE_DEVICE_UNLOCK_TOKEN = "unlockToken"; + private static final String MOBILE_DEVICE_CHALLENGE = "challenge"; public static Document convertToDocument(File file) throws DeviceManagementException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); @@ -87,12 +91,16 @@ public class MobileDeviceManagementUtil { mobileDevice.setMobileDeviceId(device.getDeviceIdentifier()); mobileDevice.setImei(getPropertyValue(device, MOBILE_DEVICE_IMEI)); mobileDevice.setImsi(getPropertyValue(device, MOBILE_DEVICE_IMSI)); - mobileDevice.setRegId(getPropertyValue(device, MOBILE_DEVICE_REG_ID)); + mobileDevice.setPushToken(getPropertyValue(device, MOBILE_DEVICE_PUSH_TOKEN)); mobileDevice.setModel(getPropertyValue(device, MOBILE_DEVICE_MODEL)); mobileDevice.setOsVersion(getPropertyValue(device, MOBILE_DEVICE_OS_VERSION)); mobileDevice.setVendor(getPropertyValue(device, MOBILE_DEVICE_VENDOR)); mobileDevice.setLatitude(getPropertyValue(device, MOBILE_DEVICE_LATITUDE)); mobileDevice.setLongitude(getPropertyValue(device, MOBILE_DEVICE_LONGITUDE)); + mobileDevice.setChallenge(getPropertyValue(device, MOBILE_DEVICE_CHALLENGE)); + mobileDevice.setToken(getPropertyValue(device, MOBILE_DEVICE_TOKEN)); + mobileDevice.setSerial(getPropertyValue(device, MOBILE_DEVICE_SERIAL)); + mobileDevice.setUnlockToken(getPropertyValue(device, MOBILE_DEVICE_UNLOCK_TOKEN)); } return mobileDevice; } @@ -104,12 +112,16 @@ public class MobileDeviceManagementUtil { List propertyList = new ArrayList(); propertyList.add(getProperty(MOBILE_DEVICE_IMEI, mobileDevice.getImei())); propertyList.add(getProperty(MOBILE_DEVICE_IMSI, mobileDevice.getImsi())); - propertyList.add(getProperty(MOBILE_DEVICE_REG_ID, mobileDevice.getRegId())); + propertyList.add(getProperty(MOBILE_DEVICE_PUSH_TOKEN, mobileDevice.getPushToken())); propertyList.add(getProperty(MOBILE_DEVICE_MODEL, mobileDevice.getModel())); propertyList.add(getProperty(MOBILE_DEVICE_OS_VERSION, mobileDevice.getOsVersion())); propertyList.add(getProperty(MOBILE_DEVICE_VENDOR, mobileDevice.getVendor())); propertyList.add(getProperty(MOBILE_DEVICE_LATITUDE, mobileDevice.getLatitude())); propertyList.add(getProperty(MOBILE_DEVICE_LONGITUDE, mobileDevice.getLongitude())); + propertyList.add(getProperty(MOBILE_DEVICE_CHALLENGE, mobileDevice.getChallenge())); + propertyList.add(getProperty(MOBILE_DEVICE_TOKEN, mobileDevice.getToken())); + propertyList.add(getProperty(MOBILE_DEVICE_SERIAL, mobileDevice.getSerial())); + propertyList.add(getProperty(MOBILE_DEVICE_UNLOCK_TOKEN, mobileDevice.getUnlockToken())); device.setProperties(propertyList); device.setDeviceIdentifier(mobileDevice.getMobileDeviceId()); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceDAOTestSuite.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceDAOTestSuite.java index da7b502a3f..f148d4794a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceDAOTestSuite.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceDAOTestSuite.java @@ -51,10 +51,14 @@ public class MobileDeviceDAOTestSuite { public static final String TEST_MOBILE_MODEL = "S5"; public static final String TEST_MOBILE_VENDOR = "samsung"; public static final String TEST_MOBILE_UPDATED_VENDOR = "sony"; - public static final String TEST_MOBILE_REG_ID = "2414"; + public static final String TEST_MOBILE_PUSH_TOKEN = "2414"; public static final String TEST_MOBILE_OS_VERSION = "5.0.0"; public static final String TEST_MOBILE_LATITUDE = "6.93N"; public static final String TEST_MOBILE_LONGITUDE = "80.60E"; + public static final String TEST_MOBILE_TOKEN = "2412K2HKHK24K12H4"; + public static final String TEST_MOBILE_SERIAL = "24124IIH4I2K4"; + public static final String TEST_MOBILE_CHALLENGE = "ASFASFSAFASFATWTWQTTQWTWQTQWTQWTWQT"; + public static final String TEST_MOBILE_UNLOCK_TOKEN = "FAFWQUWFUQWYWQYRWQURYUURUWQUWRUWRUWE"; private TestDBConfiguration testDBConfiguration; private MobileDeviceDAOImpl mblDeviceDAO; @@ -93,23 +97,28 @@ public class MobileDeviceDAOTestSuite { mobileDevice.setImsi(TEST_MOBILE_IMSI); mobileDevice.setModel(TEST_MOBILE_MODEL); mobileDevice.setVendor(TEST_MOBILE_VENDOR); - mobileDevice.setRegId(TEST_MOBILE_REG_ID); + mobileDevice.setPushToken(TEST_MOBILE_PUSH_TOKEN); mobileDevice.setOsVersion(TEST_MOBILE_OS_VERSION); mobileDevice.setLatitude(TEST_MOBILE_LATITUDE); mobileDevice.setLongitude(TEST_MOBILE_LONGITUDE); + mobileDevice.setToken(TEST_MOBILE_TOKEN); + mobileDevice.setSerial(TEST_MOBILE_SERIAL); + mobileDevice.setChallenge(TEST_MOBILE_CHALLENGE); + mobileDevice.setUnlockToken(TEST_MOBILE_UNLOCK_TOKEN); boolean added = mblDeviceDAO.addMobileDevice(mobileDevice); try { conn = DriverManager.getConnection(testDBConfiguration.getConnectionURL()); String selectDBQuery = - "SELECT MOBILE_DEVICE_ID, REG_ID, IMEI, IMSI, OS_VERSION,DEVICE_MODEL, VENDOR, " + - "LATITUDE, LONGITUDE FROM MBL_DEVICE WHERE MOBILE_DEVICE_ID = ?"; + "SELECT MOBILE_DEVICE_ID, PUSH_TOKEN, IMEI, IMSI, OS_VERSION,DEVICE_MODEL, VENDOR, " + + "LATITUDE, LONGITUDE, CHALLENGE, SERIAL, TOKEN, UNLOCK_TOKEN FROM MBL_DEVICE " + + "WHERE MOBILE_DEVICE_ID = ?"; preparedStatement = conn.prepareStatement(selectDBQuery); preparedStatement.setString(1, TEST_MOBILE_DEVICE_ID); ResultSet resultSet = preparedStatement.executeQuery(); if (resultSet.next()) { testMblDevice.setMobileDeviceId(resultSet.getString(1)); - testMblDevice.setRegId(resultSet.getString(2)); + testMblDevice.setPushToken(resultSet.getString(2)); testMblDevice.setImei(resultSet.getString(3)); testMblDevice.setImsi(resultSet.getString(4)); testMblDevice.setOsVersion(resultSet.getString(5)); @@ -117,6 +126,10 @@ public class MobileDeviceDAOTestSuite { testMblDevice.setVendor(resultSet.getString(7)); testMblDevice.setLatitude(resultSet.getString(8)); testMblDevice.setLongitude(resultSet.getString(9)); + testMblDevice.setChallenge(resultSet.getString(10)); + testMblDevice.setSerial(resultSet.getString(11)); + testMblDevice.setToken(resultSet.getString(12)); + testMblDevice.setUnlockToken(resultSet.getString(13)); } } catch (SQLException e) { String msg = "Error in retrieving Mobile Device data "; @@ -140,10 +153,18 @@ public class MobileDeviceDAOTestSuite { "MobileDevice model has persisted "); Assert.assertEquals(TEST_MOBILE_OS_VERSION, testMblDevice.getOsVersion(), "MobileDevice os-version has persisted "); - Assert.assertEquals(TEST_MOBILE_REG_ID, testMblDevice.getRegId(), + Assert.assertEquals(TEST_MOBILE_PUSH_TOKEN, testMblDevice.getPushToken(), "MobileDevice reg-id has persisted "); Assert.assertEquals(TEST_MOBILE_VENDOR, testMblDevice.getVendor(), "MobileDevice vendor has persisted "); + Assert.assertEquals(TEST_MOBILE_CHALLENGE, testMblDevice.getChallenge(), + "MobileDevice challenge has persisted "); + Assert.assertEquals(TEST_MOBILE_SERIAL, testMblDevice.getSerial(), + "MobileDevice serial has persisted"); + Assert.assertEquals(TEST_MOBILE_UNLOCK_TOKEN, testMblDevice.getUnlockToken(), + "MobileDevice unlock-token has persisted"); + Assert.assertEquals(TEST_MOBILE_TOKEN, testMblDevice.getToken(), + "MobileDevice token has persisted"); } @Test(dependsOnMethods = { "addMobileDeviceTest" }) @@ -164,10 +185,18 @@ public class MobileDeviceDAOTestSuite { "MobileDevice model has persisted "); Assert.assertEquals(TEST_MOBILE_OS_VERSION, testMblDevice.getOsVersion(), "MobileDevice os-version has persisted "); - Assert.assertEquals(TEST_MOBILE_REG_ID, testMblDevice.getRegId(), + Assert.assertEquals(TEST_MOBILE_PUSH_TOKEN, testMblDevice.getPushToken(), "MobileDevice reg-id has persisted "); Assert.assertEquals(TEST_MOBILE_VENDOR, testMblDevice.getVendor(), "MobileDevice vendor has persisted "); + Assert.assertEquals(TEST_MOBILE_CHALLENGE, testMblDevice.getChallenge(), + "MobileDevice challenge has persisted "); + Assert.assertEquals(TEST_MOBILE_SERIAL, testMblDevice.getSerial(), + "MobileDevice serial has persisted"); + Assert.assertEquals(TEST_MOBILE_UNLOCK_TOKEN, testMblDevice.getUnlockToken(), + "MobileDevice unlock-token has persisted"); + Assert.assertEquals(TEST_MOBILE_TOKEN, testMblDevice.getToken(), + "MobileDevice token has persisted"); } @Test(dependsOnMethods = { "addMobileDeviceTest" }) @@ -192,23 +221,28 @@ public class MobileDeviceDAOTestSuite { mobileDevice.setImsi(TEST_MOBILE_IMSI); mobileDevice.setModel(TEST_MOBILE_MODEL); mobileDevice.setVendor(TEST_MOBILE_UPDATED_VENDOR); - mobileDevice.setRegId(TEST_MOBILE_REG_ID); + mobileDevice.setPushToken(TEST_MOBILE_PUSH_TOKEN); mobileDevice.setOsVersion(TEST_MOBILE_OS_VERSION); mobileDevice.setLatitude(TEST_MOBILE_LATITUDE); mobileDevice.setLongitude(TEST_MOBILE_LONGITUDE); + mobileDevice.setToken(TEST_MOBILE_TOKEN); + mobileDevice.setSerial(TEST_MOBILE_SERIAL); + mobileDevice.setChallenge(TEST_MOBILE_CHALLENGE); + mobileDevice.setUnlockToken(TEST_MOBILE_UNLOCK_TOKEN); boolean updated = mblDeviceDAO.updateMobileDevice(mobileDevice); try { conn = DriverManager.getConnection(testDBConfiguration.getConnectionURL()); String selectDBQuery = - "SELECT MOBILE_DEVICE_ID, REG_ID, IMEI, IMSI, OS_VERSION,DEVICE_MODEL, VENDOR, " + - "LATITUDE, LONGITUDE FROM MBL_DEVICE WHERE MOBILE_DEVICE_ID = ?"; + "SELECT MOBILE_DEVICE_ID, PUSH_TOKEN, IMEI, IMSI, OS_VERSION,DEVICE_MODEL, VENDOR, " + + "LATITUDE, LONGITUDE, CHALLENGE, SERIAL, TOKEN, UNLOCK_TOKEN FROM MBL_DEVICE " + + "WHERE MOBILE_DEVICE_ID = ?"; preparedStatement = conn.prepareStatement(selectDBQuery); preparedStatement.setString(1, TEST_MOBILE_DEVICE_ID); ResultSet resultSet = preparedStatement.executeQuery(); if (resultSet.next()) { testMblDevice.setMobileDeviceId(resultSet.getString(1)); - testMblDevice.setRegId(resultSet.getString(2)); + testMblDevice.setPushToken(resultSet.getString(2)); testMblDevice.setImei(resultSet.getString(3)); testMblDevice.setImsi(resultSet.getString(4)); testMblDevice.setOsVersion(resultSet.getString(5)); @@ -216,6 +250,10 @@ public class MobileDeviceDAOTestSuite { testMblDevice.setVendor(resultSet.getString(7)); testMblDevice.setLatitude(resultSet.getString(8)); testMblDevice.setLongitude(resultSet.getString(9)); + testMblDevice.setChallenge(resultSet.getString(10)); + testMblDevice.setSerial(resultSet.getString(11)); + testMblDevice.setToken(resultSet.getString(12)); + testMblDevice.setUnlockToken(resultSet.getString(13)); } } catch (SQLException e) { String msg = "Error in retrieving Mobile Device data "; @@ -240,8 +278,9 @@ public class MobileDeviceDAOTestSuite { try { conn = DriverManager.getConnection(testDBConfiguration.getConnectionURL()); String selectDBQuery = - "SELECT MOBILE_DEVICE_ID, REG_ID, IMEI, IMSI, OS_VERSION,DEVICE_MODEL, VENDOR, " + - "LATITUDE, LONGITUDE FROM MBL_DEVICE WHERE MOBILE_DEVICE_ID = ?"; + "SELECT MOBILE_DEVICE_ID, PUSH_TOKEN, IMEI, IMSI, OS_VERSION,DEVICE_MODEL, VENDOR, " + + "LATITUDE, LONGITUDE, CHALLENGE, SERIAL, TOKEN, UNLOCK_TOKEN FROM MBL_DEVICE " + + "WHERE MOBILE_DEVICE_ID = ?"; preparedStatement = conn.prepareStatement(selectDBQuery); preparedStatement.setString(1, TEST_MOBILE_DEVICE_ID); ResultSet resultSet = preparedStatement.executeQuery(); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceOperationMappingDAOTestSuite.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceOperationMappingDAOTestSuite.java index cd93428066..6c39be2322 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceOperationMappingDAOTestSuite.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceOperationMappingDAOTestSuite.java @@ -59,6 +59,10 @@ public class MobileDeviceOperationMappingDAOTestSuite { public static final String TEST_MOBILE_OS_VERSION = "5.0.0"; public static final String TEST_MOBILE_LATITUDE = "6.93N"; public static final String TEST_MOBILE_LONGITUDE = "80.60E"; + public static final String TEST_MOBILE_TOKEN = "2412K2HKHK24K12H4"; + public static final String TEST_MOBILE_SERIAL = "24124IIH4I2K4"; + public static final String TEST_MOBILE_CHALLENGE = "ASFASFSAFASFATWTWQTTQWTWQTQWTQWTWQT"; + public static final String TEST_MOBILE_UNLOCK_TOKEN = "FAFWQUWFUQWYWQYRWQURYUURUWQUWRUWRUWE"; public static final String TEST_MBL_OPR_FEATURE_CODE1 = "LOCK"; public static final String TEST_MBL_OPR_FEATURE_CODE2 = "WIPE"; public static final long TEST_MBL_OPR_CREATED_DATE = new java.util.Date().getTime(); @@ -112,10 +116,14 @@ public class MobileDeviceOperationMappingDAOTestSuite { mobileDevice.setImsi(TEST_MOBILE_IMSI); mobileDevice.setModel(TEST_MOBILE_MODEL); mobileDevice.setVendor(TEST_MOBILE_VENDOR); - mobileDevice.setRegId(TEST_MOBILE_REG_ID); + mobileDevice.setPushToken(TEST_MOBILE_REG_ID); mobileDevice.setOsVersion(TEST_MOBILE_OS_VERSION); mobileDevice.setLatitude(TEST_MOBILE_LATITUDE); mobileDevice.setLongitude(TEST_MOBILE_LONGITUDE); + mobileDevice.setToken(TEST_MOBILE_TOKEN); + mobileDevice.setSerial(TEST_MOBILE_SERIAL); + mobileDevice.setChallenge(TEST_MOBILE_CHALLENGE); + mobileDevice.setUnlockToken(TEST_MOBILE_UNLOCK_TOKEN); mblDeviceDAO.addMobileDevice(mobileDevice); //Add an Operation to the db diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/sql/CreateH2TestDB.sql b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/sql/CreateH2TestDB.sql index a49b86f4bc..a33e6d477d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/sql/CreateH2TestDB.sql +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/sql/CreateH2TestDB.sql @@ -4,7 +4,7 @@ -- ----------------------------------------------------- CREATE TABLE IF NOT EXISTS `MBL_DEVICE` ( `MOBILE_DEVICE_ID` VARCHAR(45) NOT NULL , - `REG_ID` VARCHAR(45) NULL DEFAULT NULL , + `PUSH_TOKEN` VARCHAR(45) NULL DEFAULT NULL , `IMEI` VARCHAR(45) NULL DEFAULT NULL , `IMSI` VARCHAR(45) NULL DEFAULT NULL , `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL , @@ -12,6 +12,10 @@ CREATE TABLE IF NOT EXISTS `MBL_DEVICE` ( `VENDOR` VARCHAR(45) NULL DEFAULT NULL , `LATITUDE` VARCHAR(45) NULL DEFAULT NULL, `LONGITUDE` VARCHAR(45) NULL DEFAULT NULL, + `CHALLENGE` VARCHAR(45) NULL DEFAULT NULL, + `TOKEN` VARCHAR(500) NULL DEFAULT NULL, + `UNLOCK_TOKEN` VARCHAR(500) NULL DEFAULT NULL, + `SERIAL` VARCHAR(45) NULL DEFAULT NULL, PRIMARY KEY (`MOBILE_DEVICE_ID`) );