Merge remote-tracking branch 'upstream/master' into authenticator_framework

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java

@@ -78,7 +78,7 @@ public class DeviceTypeCAppDeployer implements AppDeploymentHandler {
 
     }
 
-    private void deployTypeSpecifiedArtifacts(List<Artifact> artifacts, AxisConfiguration axisConfig,
+    protected void deployTypeSpecifiedArtifacts(List<Artifact> artifacts, AxisConfiguration axisConfig,
                                               String fileType, String directory) throws DeploymentException {
         for (Artifact artifact : artifacts) {
             Deployer deployer = AppDeployerUtils.getArtifactDeployer(axisConfig, directory, fileType);
@@ -118,7 +118,7 @@ public class DeviceTypeCAppDeployer implements AppDeploymentHandler {
 
     }
 
-    private void undeployTypeSpecifiedArtifacts(List<Artifact> artifacts, AxisConfiguration axisConfig, String fileType
+    protected void undeployTypeSpecifiedArtifacts(List<Artifact> artifacts, AxisConfiguration axisConfig, String fileType
             , String directory) throws DeploymentException {
         for (Artifact artifact : artifacts) {
                 Deployer deployer = AppDeployerUtils.getArtifactDeployer(axisConfig, directory, fileType);

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.extensions.device.type.deployer;
+
+import org.apache.axis2.deployment.DeploymentException;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.mockito.Mockito;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.wso2.carbon.application.deployer.CarbonApplication;
+import org.wso2.carbon.application.deployer.config.ApplicationConfiguration;
+import org.wso2.carbon.application.deployer.config.Artifact;
+import org.wso2.carbon.application.deployer.config.CappFile;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants;
+import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
+/*
+    Unit tests for deviceTypeCAppDeployer
+ */
+public class DeviceTypeCAppDeployerTest {
+    private DeviceTypeCAppDeployer deviceTypeCAppDeployer;
+    private CarbonApplication carbonApplication = null;
+    private AxisConfiguration axisConfiguration = null;
+    private ApplicationConfiguration applicationConfiguration = null;
+    private CappFile cappFile = new CappFile();
+
+
+    private void initializeActifact(String type) {
+        Artifact tempArtifact = new Artifact();
+        cappFile.setName("testCappFile");
+        tempArtifact.setType(type);
+        tempArtifact.addFile(cappFile);
+        Artifact.Dependency dependency = new Artifact.Dependency();
+        dependency.setArtifact(tempArtifact);
+        tempArtifact.addDependency(dependency);
+        Mockito.doReturn(tempArtifact).when(applicationConfiguration).getApplicationArtifact();
+    }
+
+    private void initializeErrorArtifact() {
+        Artifact errArtifact = new Artifact();
+        errArtifact.setType(DeviceTypePluginConstants.CDMF_PLUGIN_TYPE);
+        Artifact.Dependency dependency = new Artifact.Dependency();
+        dependency.setArtifact(errArtifact);
+        errArtifact.addDependency(dependency);
+        Mockito.doReturn(errArtifact).when(applicationConfiguration).getApplicationArtifact();
+    }
+
+    @BeforeClass
+    public void init() throws NoSuchFieldException, IllegalAccessException, IOException, RegistryException {
+        Field deviceTypePlugins;
+        Field deviceTypeUIs;
+        deviceTypeCAppDeployer = Mockito.mock(DeviceTypeCAppDeployer.class, Mockito.CALLS_REAL_METHODS);
+        carbonApplication = Mockito.mock(CarbonApplication.class, Mockito.CALLS_REAL_METHODS);
+        axisConfiguration = Mockito.mock(AxisConfiguration.class, Mockito.CALLS_REAL_METHODS);
+        applicationConfiguration = Mockito.mock(ApplicationConfiguration.class, Mockito.CALLS_REAL_METHODS);
+        Mockito.doReturn(applicationConfiguration).when(carbonApplication).getAppConfig();
+        Mockito.doNothing().when(deviceTypeCAppDeployer).deployTypeSpecifiedArtifacts(Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any());
+        Mockito.doNothing().when(deviceTypeCAppDeployer).undeployTypeSpecifiedArtifacts(Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any());
+        this.initializeCarbonContext();
+        deviceTypePlugins = DeviceTypeCAppDeployer.class.getDeclaredField("deviceTypePlugins");
+        deviceTypePlugins.setAccessible(true);
+        deviceTypePlugins.set(deviceTypeCAppDeployer, new ArrayList<Artifact>());
+        deviceTypeUIs = DeviceTypeCAppDeployer.class.getDeclaredField("deviceTypeUIs");
+        deviceTypeUIs.setAccessible(true);
+        deviceTypeUIs.set(deviceTypeCAppDeployer, new ArrayList<Artifact>());
+    }
+
+    private void initializeCarbonContext() throws IOException, RegistryException {
+        if (System.getProperty("carbon.home") == null) {
+            File file = new File("src/test/resources");
+            if (file.exists()) {
+                System.setProperty("carbon.home", file.getAbsolutePath());
+            }
+        }
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(
+                org.wso2.carbon.base.MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(
+                org.wso2.carbon.base.MultitenantConstants.SUPER_TENANT_ID);
+    }
+
+    @Test(description = "deploying a capp of plugin type")
+    public void testDeployCarbonAppsPluginType() throws DeploymentException, IllegalAccessException {
+        initializeActifact(DeviceTypePluginConstants.CDMF_PLUGIN_TYPE);
+        deviceTypeCAppDeployer.deployArtifacts(carbonApplication, axisConfiguration);
+    }
+
+    @Test(description = "deploying an erroneous car file")
+    public void testDeployErrorArtifact() throws DeploymentException, IllegalAccessException {
+        initializeErrorArtifact();
+        deviceTypeCAppDeployer.deployArtifacts(carbonApplication, axisConfiguration);
+    }
+
+    @Test(dependsOnMethods = {"testDeployCarbonAppsPluginType"}, description = "undeploying previously deployed capp")
+    public void testUndeployCarbonAppsPluginType() throws DeploymentException {
+        deviceTypeCAppDeployer.undeployArtifacts(carbonApplication, axisConfiguration);
+    }
+
+    @Test(dependsOnMethods = {"testUndeployCarbonAppsPluginType"}, description = "deploying a capp of UI type")
+    public void testDeployCarbonAppsUiType() throws DeploymentException, IllegalAccessException {
+        initializeActifact(DeviceTypePluginConstants.CDMF_UI_TYPE);
+        deviceTypeCAppDeployer.deployArtifacts(carbonApplication, axisConfiguration);
+    }
+
+    @Test(dependsOnMethods = {"testDeployCarbonAppsUiType"}, description = "Undeploy previously deployed capp")
+    public void testUndeployCarbonAppsUiType() throws DeploymentException {
+        deviceTypeCAppDeployer.undeployArtifacts(carbonApplication, axisConfiguration);
+    }
+}

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java

@@ -40,9 +40,12 @@ import java.util.concurrent.ConcurrentHashMap;
 public class DeviceTypePluginDeployerTest {
     private DeviceTypePluginDeployer deviceTypePluginDeployer;
     private DeploymentFileData deploymentFileData;
+    private DeploymentFileData invalidDeploymentFileData;
     private Field deviceTypeServiceRegistrations = null;
     private Field deviceTypeConfigurationDataMap = null;
     private ServiceRegistration serviceRegistration = null;
+    private File file = new File("src/test/resources/android.xml");
+    private File invalidFile = new File("src/test/resources/invalidAndroid.xml");
 
     @BeforeClass
     public void init() throws NoSuchFieldException, IllegalAccessException, IOException, RegistryException {
@@ -59,10 +62,15 @@ public class DeviceTypePluginDeployerTest {
         deviceTypeConfigurationDataMap.setAccessible(true);
         deviceTypeConfigurationDataMap.set(deviceTypePluginDeployer, new ConcurrentHashMap());
         this.initializeCarbonContext();
+        if (file.exists()) {
+            deploymentFileData = new DeploymentFileData(file);
+        }
+        if (invalidFile.exists()) {
+            invalidDeploymentFileData = new DeploymentFileData(invalidFile);
+        }
     }
 
     private void initializeCarbonContext() throws IOException, RegistryException {
-
         if (System.getProperty("carbon.home") == null) {
             File file = new File("src/test/resources");
             if (file.exists()) {
@@ -78,10 +86,6 @@ public class DeviceTypePluginDeployerTest {
     @SuppressWarnings("unchecked")
     @Test(description = "Testing deviceType deploy method by deploying Android device type")
     public void deploy() throws DeploymentException, IllegalAccessException {
-        File file = new File("src/test/resources/android.xml");
-        if (file.exists()) {
-            deploymentFileData = new DeploymentFileData(file);
-        }
         deviceTypePluginDeployer.deploy(deploymentFileData);
         Map<String, ServiceRegistration> tempServiceRegistration = (Map<String, ServiceRegistration>)
                 deviceTypeServiceRegistrations.get(deviceTypePluginDeployer);
@@ -92,4 +96,29 @@ public class DeviceTypePluginDeployerTest {
                 .getAbsolutePath());
         Assert.assertEquals(deviceTypeConfigIdentifier.getDeviceType(), "android");
     }
+
+    @Test(description = "Testing exception for invalid xml files", expectedExceptions = {org.apache.axis2.deployment
+            .DeploymentException.class})
+    public void deployInvalidXml() throws DeploymentException, IllegalAccessException {
+        deviceTypePluginDeployer.deploy(invalidDeploymentFileData);
+    }
+
+    @Test(description = "Testing exception for non existing xml file", expectedExceptions = {org.apache.axis2.deployment
+            .DeploymentException.class})
+    public void unDeployInvalidXml() throws DeploymentException, IllegalAccessException {
+        deviceTypePluginDeployer.deploy(new DeploymentFileData(new File("src/test/resources/notExist.xml")));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test(dependsOnMethods = {"deploy"} , description = "Testing deviceType undeploy method by un-deploying Android " +
+            "device type")
+    public void unDeploy() throws DeploymentException, IllegalAccessException {
+        deviceTypePluginDeployer.undeploy(deploymentFileData.getAbsolutePath());
+        Map<String, ServiceRegistration> tempServiceRegistration = (Map<String, ServiceRegistration>)
+                deviceTypeServiceRegistrations.get(deviceTypePluginDeployer);
+        Assert.assertNull(tempServiceRegistration.get(deploymentFileData.getAbsolutePath()));
+        Map<String, DeviceTypeConfigIdentifier> tempDeviceTypeConfig = (Map<String, DeviceTypeConfigIdentifier>)
+                deviceTypeConfigurationDataMap.get(deviceTypePluginDeployer);
+        Assert.assertNull(tempDeviceTypeConfig.get(deploymentFileData.getAbsolutePath()));
+    }
 }

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/invalidAndroid.xml

@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="utf-8"?
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<DeviceTypeConfiguration name="android">
+
+    <DeviceDetails table-id="AD_DEVICE"/>
+
+    <License>
+        <Language>en_US</Language>
+        <Version>1.0.0</Version>
+        <Text>This End User License Agreement ("Agreement") is a legal agreement between you ("You") and WSO2,
+            Inc., regarding the enrollment of Your personal mobile device ("Device") in SoR's mobile device
+            management program, and the loading to and removal from Your Device and Your use of certain
+            applications and any associated software and user documentation, whether provided in "online" or
+            electronic format, used in connection with the operation of or provision of services to WSO2,
+            Inc., BY SELECTING "I ACCEPT" DURING INSTALLATION, YOU ARE ENROLLING YOUR DEVICE, AND THEREBY
+            AUTHORIZING SOR OR ITS AGENTS TO INSTALL, UPDATE AND REMOVE THE APPS FROM YOUR DEVICE AS DESCRIBED
+            IN THIS AGREEMENT. YOU ARE ALSO EXPLICITLY ACKNOWLEDGING AND AGREEING THAT (1) THIS IS A BINDING
+            CONTRACT AND (2) YOU HAVE READ AND AGREE TO THE TERMS OF THIS AGREEMENT.
+
+            IF YOU DO NOT ACCEPT THESE TERMS, DO NOT ENROLL YOUR DEVICE AND DO NOT PROCEED ANY FURTHER.
+
+            You agree that: (1) You understand and agree to be bound by the terms and conditions contained in
+            this Agreement, and (2) You are at least 21 years old and have the legal capacity to enter into
+            this Agreement as defined by the laws of Your jurisdiction. SoR shall have the right, without
+            prior notice, to terminate or suspend (i) this Agreement, (ii) the enrollment of Your Device, or
+            (iii) the functioning of the Apps in the event of a violation of this Agreement or the cessation
+            of Your relationship with SoR (including termination of Your employment if You are an employee or
+            expiration or termination of Your applicable franchise or supply agreement if You are a franchisee
+            of or supplier to the WSO2 WSO2, Inc., system). SoR expressly reserves all rights not expressly
+            granted herein.
+        </Text>
+    </License>
+
+    <ProvisioningConfig>
+        <SharedWithAllTenants>true</SharedWithAllTenants>
+    </ProvisioningConfig>
+    <!--
+    isScheduled element used to enable scheduler task to send push notification.
+    Task will send push notification as batches. So this will reduce sudden request burst when many devices try to
+    access server after receiving push notification.
+    -->
+    <!--Configuration for enable firebase push notifications-->
+    <!--<PushNotificationProviderConfig type="FCM" isScheduled="false">-->
+    <!--</PushNotificationProviderConfig>-->
+
+    <DataSource>
+        <JndiConfig>
+            <Name>jdbc/MobileAndroidDM_DS</Name>
+        </JndiConfig>
+        <TableConfig>
+            <Table name="AD_DEVICE">
+                <PrimaryKey>DEVICE_ID</PrimaryKey>
+                <Attributes>
+                    <Attribute>FCM_TOKEN</Attribute>
+                    <Attribute>DEVICE_INFO</Attribute>
+                    <Attribute>IMEI</Attribute>
+                    <Attribute>IMSI</Attribute>
+                    <Attribute>OS_VERSION</Attribute>
+                    <Attribute>DEVICE_MODEL</Attribute>
+                    <Attribute>VENDOR</Attribute>
+                    <Attribute>LATITUDE</Attribute>
+                    <Attribute>LONGITUDE</Attribute>
+                    <Attribute>SERIAL</Attribute>
+                    <Attribute>MAC_ADDRESS</Attribute>
+                    <Attribute>DEVICE_NAME</Attribute>
+                    <Attribute>OS_BUILD_DATE</Attribute>
+                </Attributes>
+            </Table>
+        </TableConfig>
+    </DataSource>
+
+    <Features>
+        <Feature code="DEVICE_RING">
+            <Name>Ring</Name>
+            <Description>Ring the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/ring" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="DEVICE_LOCK">
+            <Name>Device Lock</Name>
+            <Description>Lock the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/lock-devices" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="DEVICE_LOCATION">
+            <Name>Location</Name>
+            <Description>Request coordinates of device location</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/location" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="CLEAR_PASSWORD">
+            <Name>Clear Password</Name>
+            <Description>Clear current password</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/clear-password" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="DEVICE_REBOOT">
+            <Name>Reboot</Name>
+            <Description>Reboot the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/reboot" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="UPGRADE_FIRMWARE">
+            <Name>Upgrade Firmware</Name>
+            <Description>Upgrade Firmware</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/upgrade-firmware" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="DEVICE_MUTE">
+            <Name>Mute</Name>
+            <Description>Enable mute in the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/mute" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="NOTIFICATION">
+            <Name>Message</Name>
+            <Description>Send message</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/send-notification" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="CHANGE_LOCK_CODE">
+            <Name>Change Lock-code</Name>
+            <Description>Change current lock code</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/change-lock-code" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="ENTERPRISE_WIPE">
+            <Name>Enterprise Wipe</Name>
+            <Description>Remove enterprise applications</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/enterprise-wipe" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="WIPE_DATA">
+            <Name>Wipe Data</Name>
+            <Description>Factory reset the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/wipe" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="WIFI">
+            <Name>Wifi</Name>
+            <Description>Setting up wifi configuration</Description>
+        </Feature>
+        <Feature code="CAMERA">
+            <Name>Camera</Name>
+            <Description>Enable or disable camera</Description>
+        </Feature>
+        <Feature code="EMAIL">
+            <Name>Email</Name>
+            <Description>Configure email settings</Description>
+        </Feature>
+        <Feature code="DEVICE_INFO">
+            <Name>Device info</Name>
+            <Description>Request device information</Description>
+        </Feature>
+        <Feature code="APPLICATION_LIST">
+            <Name>Application List</Name>
+            <Description>Request list of current installed applications</Description>
+        </Feature>
+        <Feature code="INSTALL_APPLICATION">
+            <Name>Install App</Name>
+            <Description>Install App</Description>
+        </Feature>
+        <Feature code="UNINSTALL_APPLICATION">
+            <Name>Uninstall App</Name>
+            <Description>Uninstall App</Description>
+        </Feature>
+        <Feature code="BLACKLIST_APPLICATIONS">
+            <Name>Blacklist app</Name>
+            <Description>Blacklist applications</Description>
+        </Feature>
+        <Feature code="ENCRYPT_STORAGE">
+            <Name>Encrypt Storage</Name>
+            <Description>Encrypt storage</Description>
+        </Feature>
+        <Feature code="PASSCODE_POLICY">
+            <Name>Password Policy</Name>
+            <Description>Set passcode policy</Description>
+        </Feature>
+        <Feature code="VPN">
+            <Name>Configure VPN</Name>
+            <Description>Configure VPN settings</Description>
+        </Feature>
+        <Feature code="DISALLOW_ADJUST_VOLUME">
+            <Name>Disallow user to change volume</Name>
+            <Description>Allow or disallow user to change volume"</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_BLUETOOTH">
+            <Name>Disallow bluetooth configuration</Name>
+            <Description>Allow or disallow bluetooth configuration</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_CELL_BROADCASTS">
+            <Name>Disallow user to change cell broadcast configurations</Name>
+            <Description>Allow or disallow user to change cell broadcast configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_CREDENTIALS">
+            <Name>Disallow user to change user credentials</Name>
+            <Description>Allow or disallow user to change user credentials</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_MOBILE_NETWORKS">
+            <Name>Disallow user to change mobile networks configurations</Name>
+            <Description>Allow or disallow user to change mobile networks configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_TETHERING">
+            <Name>Disallow user to change tethering configurations</Name>
+            <Description>Allow or disallow user to change tethering configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_VPN">
+            <Name>Disallow user to change VPN configurations</Name>
+            <Description>Allow or disallow user to change VPN configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_WIFI">
+            <Name>Disallow user to change WIFI configurations</Name>
+            <Description>Allow or disallow user to change WIFI configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_APPS_CONTROL">
+            <Name>Disallow user to change app control</Name>
+            <Description>Allow or disallow user to change app control</Description>
+        </Feature>
+        <Feature code="DISALLOW_CREATE_WINDOWS">
+            <Name>Disallow window creation</Name>
+            <Description>Allow or disallow window creation</Description>
+        </Feature>
+        <Feature code="DISALLOW_APPS_CONTROL">
+            <Name>Disallow user to change app control configurations</Name>
+            <Description>Allow or disallow user to change app control configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_CROSS_PROFILE_COPY_PASTE">
+            <Name>Disallow cross profile copy paste</Name>
+            <Description>Allow or disallow cross profile copy paste</Description>
+        </Feature>
+        <Feature code="DISALLOW_DEBUGGING_FEATURES">
+            <Name>Disallow debugging features</Name>
+            <Description>Allow or disallow debugging features</Description>
+        </Feature>
+        <Feature code="DISALLOW_FACTORY_RESET">
+            <Name>Disallow factory reset</Name>
+            <Description>Allow or disallow factory reset</Description>
+        </Feature>
+        <Feature code="DISALLOW_ADD_USER">
+            <Name>Disallow add user</Name>
+            <Description>Allow or disallow add user</Description>
+        </Feature>
+        <Feature code="DISALLOW_INSTALL_APPS">
+            <Name>Disallow install apps</Name>
+            <Description>Allow or disallow install apps</Description>
+        </Feature>
+        <Feature code="DISALLOW_INSTALL_UNKNOWN_SOURCES">
+            <Name>Disallow install unknown sources</Name>
+            <Description>Allow or disallow install unknown sources</Description>
+        </Feature>
+        <Feature code="DISALLOW_MODIFY_ACCOUNTS">
+            <Name>Disallow modify account</Name>
+            <Description>Allow or disallow modify account</Description>
+        </Feature>
+        <Feature code="DISALLOW_MOUNT_PHYSICAL_MEDIA">
+            <Name>Disallow mount physical media</Name>
+            <Description>Allow or disallow mount physical media</Description>
+        </Feature>
+        <Feature code="DISALLOW_NETWORK_RESET">
+            <Name>Disallow network reset</Name>
+            <Description>Allow or disallow network reset</Description>
+        </Feature>
+        <Feature code="DISALLOW_OUTGOING_BEAM">
+            <Name>Disallow outgoing beam</Name>
+            <Description>Allow or disallow outgoing beam</Description>
+        </Feature>
+        <Feature code="DISALLOW_OUTGOING_CALLS">
+            <Name>Disallow outgoing calls</Name>
+            <Description>Allow or disallow outgoing calls</Description>
+        </Feature>
+        <Feature code="DISALLOW_REMOVE_USER">
+            <Name>Disallow remove users</Name>
+            <Description>Allow or disallow remove users</Description>
+        </Feature>
+        <Feature code="DISALLOW_SAFE_BOOT">
+            <Name>Disallow safe boot</Name>
+            <Description>Allow or disallow safe boot</Description>
+        </Feature>
+        <Feature code="DISALLOW_SHARE_LOCATION">
+            <Name>Disallow share location</Name>
+            <Description>Allow or disallow share location</Description>
+        </Feature>
+        <Feature code="DISALLOW_SMS">
+            <Name>Disallow sms</Name>
+            <Description>Allow or disallow sms</Description>
+        </Feature>
+        <Feature code="DISALLOW_UNINSTALL_APPS">
+            <Name>Disallow uninstall app</Name>
+            <Description>Allow or disallow uninstall app</Description>
+        </Feature>
+        <Feature code="DISALLOW_UNMUTE_MICROPHONE">
+            <Name>Disallow unmute mic</Name>
+            <Description>Allow or disallow unmute mic</Description>
+        </Feature>
+        <Feature code="DISALLOW_USB_FILE_TRANSFER">
+            <Name>Disallow usb file transfer</Name>
+            <Description>Allow or disallow usb file transfer</Description>
+        </Feature>
+        <Feature code="ALLOW_PARENT_PROFILE_APP_LINKING">
+            <Name>Disallow parent profile app linking</Name>
+            <Description>Allow or disallow parent profile app linking</Description>
+        </Feature>
+        <Feature code="ENSURE_VERIFY_APPS">
+            <Name>Disallow ensure verify apps</Name>
+            <Description>Allow or disallow ensure verify apps</Description>
+        </Feature>
+        <Feature code="AUTO_TIME">
+            <Name>Disallow auto timing</Name>
+            <Description>Allow or disallow auto timing</Description>
+        </Feature>
+        <Feature code="REMOVE_DEVICE_OWNER">
+            <Name>Remove device owner</Name>
+            <Description>Remove device owner</Description>
+        </Feature>
+        <Feature code="LOGCAT">
+            <Name>Fetch device logcat</Name>
+            <Description>Fetch device logcat</Description>
+        </Feature>
+        <Feature code="DEVICE_UNLOCK">
+            <Name>Unlock the device</Name>
+            <Description>Unlock the device</Description>
+        </Feature>
+    </Features>
+    <TaskConfiguration>
+        <Enable>true</Enable>
+        <Frequency>60000</Frequency>
+        <Operations>
+            <Operation>
+                <Name>DEVICE_INFO</Name>
+                <RecurrentTimes>1</RecurrentTimes>
+            </Operation>
+            <Operation>
+                <Name>APPLICATION_LIST</Name>
+                <RecurrentTimes>5</RecurrentTimes>
+            </Operation>
+            <Operation>
+                <Name>DEVICE_LOCATION</Name>
+                <RecurrentTimes>1</RecurrentTimes>
+            </Operation>
+        </Operations>
+    </TaskConfiguration>
+	<PolicyMonitoring enabled="true"/>
+    <InitialOperationConfig>
+        <Operations>
+            <Operation>DEVICE_INFO</Operation>
+            <Operation>APPLICATION_LIST</Operation>
+            <Operation>DEVICE_LOCATION</Operation>
+        </Operations>
+    </InitialOperationConfig>
+    <!--This configures the Task service for the android device-type. Given below are the property definitions.
+        <RequireStatusMonitoring> - This will enable or disable status monitoring for that particular device-type.
+        <Frequency> - The time interval (in seconds) in which the task should run for this device-type
+        <IdleTimeToMarkInactive> - The time duration (in seconds) in which the device can be moved to inactive status
+                                   which means the device will be moved to inactive status if that device does not
+                                   contact the server within that time period. Better to have a multiplier of Frequency.
+        <IdleTimeToMarkUnreachable> - The time duration (in seconds) in which the device can be moved to unreachable status
+                                      which means the device will be moved to unreachable status if that device does not
+                                      contact the server within that time period. Better to have a multiplier of Frequency.
+    -->
+    <DeviceStatusTaskConfig>
+        <RequireStatusMonitoring>true</RequireStatusMonitoring>
+        <Frequency>300</Frequency>
+        <IdleTimeToMarkInactive>900</IdleTimeToMarkInactive>
+        <IdleTimeToMarkUnreachable>600</IdleTimeToMarkUnreachable>
+    </DeviceStatusTaskConfig>
+</DeviceTypeConfiguration>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml

@@ -23,6 +23,7 @@
     <test name="Extension Unit Tests" preserve-order="true">
         <classes>
             <class name="org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployerTest"/>
+            <class name="org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployerTest"/>
         </classes>
     </test>
 </suite>

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/EnrollmentDAOImpl.java

@@ -23,9 +23,12 @@ import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.dao.EnrollmentDAO;
 import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
-import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMapping;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -201,25 +204,53 @@ public class EnrollmentDAOImpl implements EnrollmentDAO {
         return true;
     }
 
+    private int getCountOfDevicesOfOwner(String owner, int tenantID) throws DeviceManagementDAOException {
+        Connection conn;
+        PreparedStatement stmt = null;
+        ResultSet rs = null;
+        int count = 0;
+        try {
+            conn = this.getConnection();
+            String checkQuery = "SELECT COUNT(ID) AS COUNT FROM DM_ENROLMENT WHERE OWNER = ? AND TENANT_ID = ?";
+            stmt = conn.prepareStatement(checkQuery);
+            stmt.setString(1, owner);
+            stmt.setInt(2, tenantID);
+            rs = stmt.executeQuery();
+            if(rs.next()){
+                count = rs.getInt("COUNT");
+            }
+        } catch (SQLException e) {
+            throw new DeviceManagementDAOException("Error occurred while trying to get device " +
+                    "count of Owner : "+owner, e);
+        } finally {
+            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+        }
+        return count;
+    }
+
     @Override
     public boolean setStatus(String currentOwner, EnrolmentInfo.Status status,
                              int tenantId) throws DeviceManagementDAOException {
         Connection conn;
         PreparedStatement stmt = null;
-        try {
-            conn = this.getConnection();
-            String sql = "UPDATE DM_ENROLMENT SET STATUS = ? WHERE OWNER = ? AND TENANT_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setString(1, status.toString());
-            stmt.setString(2, currentOwner);
-            stmt.setInt(3, tenantId);
-            stmt.executeUpdate();
-        } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while setting the status of device enrolment", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+        if(getCountOfDevicesOfOwner(currentOwner, tenantId) > 0){
+            try {
+                conn = this.getConnection();
+                String sql = "UPDATE DM_ENROLMENT SET STATUS = ? WHERE OWNER = ? AND TENANT_ID = ?";
+                stmt = conn.prepareStatement(sql);
+                stmt.setString(1, status.toString());
+                stmt.setString(2, currentOwner);
+                stmt.setInt(3, tenantId);
+                stmt.executeUpdate();
+            } catch (SQLException e) {
+                throw new DeviceManagementDAOException("Error occurred while setting the status of device enrolment", e);
+            } finally {
+                DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            }
+            return true;
+        } else {
+            return false;
         }
-        return true;
     }
 
     @Override

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java

@@ -20,6 +20,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class TestDeviceManager implements DeviceManager {
@@ -80,7 +81,15 @@ public class TestDeviceManager implements DeviceManager {
 
     @Override
     public Device getDevice(DeviceIdentifier deviceId) throws DeviceManagementException {
-        return null;
+        List<Feature> features = new ArrayList<Feature>();
+        List<Device.Property> properties = new ArrayList<Device.Property>();
+        Device.Property prop1 = new Device.Property();
+        prop1.setName("Prop1");
+        prop1.setValue("Prop1-value");
+        properties.add(prop1);
+        Device device = new Device(deviceId.getType()+"-"+deviceId.getId(), deviceId.getType(),
+                "This is a test Device", deviceId.getId(), null, features, properties);
+        return device;
     }
 
     @Override
@@ -92,7 +101,7 @@ public class TestDeviceManager implements DeviceManager {
     @Override
     public boolean setOwnership(DeviceIdentifier deviceId, String ownershipType)
             throws DeviceManagementException {
-        return false;
+        return true;
     }
 
     @Override

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceTest.java

@@ -17,6 +17,7 @@ package org.wso2.carbon.device.mgt.core.service;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.mockito.Mockito;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -45,10 +46,12 @@ import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.core.internal.RegistryDataHolder;
 import org.wso2.carbon.registry.core.jdbc.realm.InMemoryRealmService;
 import org.wso2.carbon.registry.core.service.RegistryService;
+import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 
 import java.io.InputStream;
+import java.lang.reflect.Field;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -98,6 +101,20 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         Assert.assertTrue(deviceTypes.size() > 0);
     }
 
+    @Test
+    public void testGetAvailableDeviceType() throws DeviceManagementException {
+        DeviceType deviceType = deviceMgtService.getDeviceType(DEVICE_TYPE);
+        Assert.assertTrue(deviceType.getName().equalsIgnoreCase(DEVICE_TYPE));
+    }
+
+    @Test
+    public void addLicense() throws DeviceManagementException {
+        License license = new License();
+        license.setLanguage("ENG");
+        license.setName("RANDON_DEVICE_LICENSE");
+        deviceMgtService.addLicense(DEVICE_TYPE, license);
+    }
+
     @Test(expectedExceptions = DeviceManagementException.class)
     public void testNullDeviceEnrollment() throws DeviceManagementException {
         deviceMgtService.enrollDevice(null);
@@ -176,14 +193,45 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
     public void testDisenrollment() throws DeviceManagementException {
         Device device = TestDataHolder.generateDummyDeviceData(new DeviceIdentifier(DEVICE_ID, DEVICE_TYPE));
         boolean disenrollmentStatus = deviceMgtService.disenrollDevice(new DeviceIdentifier
-                (device
-                        .getDeviceIdentifier(),
-                        device.getType()));
+                (device.getDeviceIdentifier(), device.getType()));
         log.info(disenrollmentStatus);
 
         Assert.assertTrue(disenrollmentStatus);
     }
 
+    @Test(dependsOnMethods = {"testReEnrollmentofSameDeviceWithOtherUser"}, expectedExceptions =
+            DeviceManagementException.class)
+    public void testDisenrollmentWithNullDeviceID() throws DeviceManagementException {
+        deviceMgtService.disenrollDevice(null);
+    }
+
+    @Test(dependsOnMethods = {"testReEnrollmentofSameDeviceWithOtherUser"})
+    public void testDisenrollmentWithNonExistentDT() throws DeviceManagementException {
+        Device device = TestDataHolder.generateDummyDeviceData(new DeviceIdentifier(DEVICE_ID,
+                "NON_EXISTENT_DT"));
+        boolean result = deviceMgtService.disenrollDevice(new DeviceIdentifier(
+                device.getDeviceIdentifier(), device.getType()));
+        Assert.assertTrue(!result);
+    }
+
+    @Test(dependsOnMethods = {"testReEnrollmentofSameDeviceWithOtherUser"})
+    public void testDisenrollmentWithNonExistentDevice() throws DeviceManagementException {
+        Device device = TestDataHolder.generateDummyDeviceData(new DeviceIdentifier(ALTERNATE_DEVICE_ID,
+                DEVICE_TYPE));
+        boolean result = deviceMgtService.disenrollDevice(new DeviceIdentifier(
+                device.getDeviceIdentifier(), device.getType()));
+        Assert.assertTrue(!result);
+    }
+
+    @Test(dependsOnMethods = {"testDisenrollment"})
+    public void testDisenrollAlreadyDisEnrolledDevice() throws DeviceManagementException {
+        Device device = TestDataHolder.generateDummyDeviceData(new DeviceIdentifier(DEVICE_ID,
+                DEVICE_TYPE));
+        boolean result = deviceMgtService.disenrollDevice(new DeviceIdentifier(
+                device.getDeviceIdentifier(), device.getType()));
+        Assert.assertTrue(result);
+    }
+
     @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
     public void testGetDeviceCount() throws DeviceManagementException {
         int count = deviceMgtService.getDeviceCount();
@@ -259,6 +307,12 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         Assert.assertTrue(device.getDeviceInfo() != null);
     }
 
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testGetDeviceTypeWithProps() throws DeviceManagementException {
+        Device device = deviceMgtService.getDeviceWithTypeProperties(new DeviceIdentifier(DEVICE_ID, DEVICE_TYPE));
+        Assert.assertTrue(!device.getProperties().isEmpty());
+    }
+
     @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
     public void testGetDeviceWithOutInfo() throws DeviceManagementException {
         Device device = deviceMgtService.getDevice(new DeviceIdentifier(DEVICE_ID, DEVICE_TYPE)
@@ -272,6 +326,35 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         Assert.assertTrue(devices.size() > 0);
     }
 
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"}, expectedExceptions =
+            DeviceManagementException.class)
+    public void testGetAllDevicesOfRoleFailureFlow() throws DeviceManagementException, UserStoreException, NoSuchFieldException, IllegalAccessException {
+        int tenantID = -1234;
+        RealmService mockRealmService = Mockito.mock(RealmService.class, Mockito.CALLS_REAL_METHODS);
+
+        Mockito.doThrow(new UserStoreException("Mocked Exception when obtaining Tenant Realm"))
+                .when(mockRealmService).getTenantUserRealm(tenantID);
+        RealmService currentRealm = DeviceManagementDataHolder.getInstance().getRealmService();
+        DeviceManagementDataHolder.getInstance().setRealmService(mockRealmService);
+        try {
+            deviceMgtService.getAllDevicesOfRole("admin");
+        } finally {
+            DeviceManagementDataHolder.getInstance().setRealmService(currentRealm);
+        }
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testGetAllDevicesOfRoleWithNonExistentRole() throws DeviceManagementException {
+        List<Device> devices = deviceMgtService.getAllDevicesOfRole("non-existent-role");
+        Assert.assertTrue(devices.size() == 0);
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"}, expectedExceptions =
+            DeviceManagementException.class)
+    public void testGetAllDevicesOfRoleWithNullArgs() throws DeviceManagementException {
+        deviceMgtService.getAllDevicesOfRole(null);
+    }
+
     @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
     public void testDeviceByOwner() throws DeviceManagementException {
         Device device = deviceMgtService.getDevice(new DeviceIdentifier(DEVICE_ID,
@@ -279,11 +362,47 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         Assert.assertTrue(device != null);
     }
 
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testDeviceByOwnerAndNonExistentDeviceID() throws DeviceManagementException {
+        String nonExistentDeviceID = "4455";
+        Device device = deviceMgtService.getDevice(new DeviceIdentifier(nonExistentDeviceID,
+                DEVICE_TYPE), "admin", true);
+        Assert.assertTrue(device == null);
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"}, expectedExceptions =
+            DeviceManagementException.class)
+    public void testDeviceByOwnerWithNullDeviceID() throws DeviceManagementException {
+        deviceMgtService.getDevice(null, "admin", true);
+    }
+
     @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
     public void testDeviceByDate() throws DeviceManagementException, TransactionManagementException, DeviceDetailsMgtDAOException {
         Device initialDevice = deviceMgtService.getDevice(new DeviceIdentifier(DEVICE_ID,
                 DEVICE_TYPE));
 
+        addDeviceInformation(initialDevice);
+
+        Device device = deviceMgtService.getDevice(new DeviceIdentifier(DEVICE_ID,
+                DEVICE_TYPE), yesterday());
+        Assert.assertTrue(device != null);
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testDeviceByDateWithNonExistentDevice() throws DeviceManagementException,
+            TransactionManagementException, DeviceDetailsMgtDAOException {
+        Device device = deviceMgtService.getDevice(new DeviceIdentifier(ALTERNATE_DEVICE_ID,
+                DEVICE_TYPE), yesterday());
+        Assert.assertTrue(device == null);
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"}, expectedExceptions =
+            DeviceManagementException.class)
+    public void testDeviceByDateWithNullDeviceID() throws DeviceManagementException {
+        deviceMgtService.getDevice(null, yesterday());
+    }
+
+    private void addDeviceInformation(Device initialDevice) throws TransactionManagementException, DeviceDetailsMgtDAOException {
         DeviceManagementDAOFactory.beginTransaction();
 
         //Device details table will be reffered when looking for last updated time
@@ -292,10 +411,6 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
                 .generateDummyDeviceInfo());
 
         DeviceManagementDAOFactory.closeConnection();
-
-        Device device = deviceMgtService.getDevice(new DeviceIdentifier(DEVICE_ID,
-                DEVICE_TYPE), yesterday());
-        Assert.assertTrue(device != null);
     }
 
     @Test(dependsOnMethods = {"testDeviceByDate"})
@@ -320,10 +435,18 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
     @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
     public void testGetAllDevicesPaginated() throws DeviceManagementException {
         PaginationRequest request = new PaginationRequest(0, 100);
+        request.setOwnerRole("admin");
         PaginationResult result = deviceMgtService.getAllDevices(request);
         Assert.assertTrue(result.getRecordsTotal() > 0);
     }
 
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"}, expectedExceptions =
+            DeviceManagementException.class)
+    public void testGetAllDevicesWithNullRequest() throws DeviceManagementException {
+        PaginationRequest request = null;
+        deviceMgtService.getAllDevices(request);
+    }
+
     @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
     public void testGetAllDevicesByName() throws DeviceManagementException {
         PaginationRequest request = new PaginationRequest(0, 100);
@@ -392,8 +515,15 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         Assert.assertTrue(false);
     }
 
-    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"}, expectedExceptions =
+            DeviceManagementException.class)
     public void testGetDeviesOfUser() throws DeviceManagementException {
+        String username = null;
+        deviceMgtService.getDevicesOfUser(username);
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testGetDeviesOfUserWhileUserNull() throws DeviceManagementException {
         List<Device> devices = deviceMgtService.getDevicesOfUser("admin");
         Assert.assertTrue(!devices.isEmpty());
     }
@@ -419,6 +549,13 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         Assert.assertTrue(result.getRecordsTotal() > 0);
     }
 
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"}, expectedExceptions =
+            DeviceManagementException.class)
+    public void testGetDeviesOfUserWhileNullOwnerPaginated() throws DeviceManagementException {
+        PaginationRequest request = null;
+        deviceMgtService.getDevicesOfUser(request, true);
+    }
+
     @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
     public void testGetDeviesByOwnership() throws DeviceManagementException {
         PaginationRequest request = new PaginationRequest(0, 100);
@@ -427,6 +564,26 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         Assert.assertTrue(result.getRecordsTotal() > 0);
     }
 
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testSetOwnership() throws DeviceManagementException {
+        boolean status = deviceMgtService.setOwnership(new DeviceIdentifier(DEVICE_ID,
+                DEVICE_TYPE), EnrolmentInfo.OwnerShip.COPE.toString());
+        Assert.assertTrue(status);
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testSetOwnershipNonExistentDT() throws DeviceManagementException {
+        boolean status = deviceMgtService.setOwnership(new DeviceIdentifier(DEVICE_ID,
+                "non-existent-dt"), EnrolmentInfo.OwnerShip.COPE.toString());
+        Assert.assertFalse(status);
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"}, expectedExceptions =
+            DeviceManagementException.class)
+    public void testSetOwnershipOfNullDevice() throws DeviceManagementException {
+        deviceMgtService.setOwnership(null, EnrolmentInfo.OwnerShip.COPE.toString());
+    }
+
     @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
     public void testGetDeviesByStatus() throws DeviceManagementException {
         PaginationRequest request = new PaginationRequest(0, 100);
@@ -435,6 +592,25 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         Assert.assertTrue(result.getRecordsTotal() > 0);
     }
 
+    @Test(dependsOnMethods = {"testReEnrollmentofSameDeviceUnderSameUser"})
+    public void testUpdateDevicesStatus() throws DeviceManagementException {
+        boolean status = deviceMgtService.setStatus("user1", EnrolmentInfo.Status.REMOVED);
+        Assert.assertTrue(status);
+    }
+
+    @Test(dependsOnMethods = {"testReEnrollmentofSameDeviceUnderSameUser"})
+    public void testUpdateDevicesStatusWithDeviceID() throws DeviceManagementException {
+        boolean status = deviceMgtService.setStatus(new DeviceIdentifier(DEVICE_ID, DEVICE_TYPE),"user1",
+                EnrolmentInfo.Status.ACTIVE);
+        Assert.assertTrue(status);
+    }
+
+    @Test(dependsOnMethods = {"testReEnrollmentofSameDeviceUnderSameUser"})
+    public void testUpdateDevicesStatusOfNonExistingUser() throws DeviceManagementException {
+        boolean status = deviceMgtService.setStatus("random-user", EnrolmentInfo.Status.REMOVED);
+        Assert.assertFalse(status);
+    }
+
     @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
     public void testGetDeviesOfUserAndDeviceType() throws DeviceManagementException {
         List<Device> devices = deviceMgtService.getDevicesOfUser("admin", DEVICE_TYPE, true);
@@ -451,7 +627,6 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         props.setProperty("password", "!@#$$$%");
 
         EmailMetaInfo metaInfo = new EmailMetaInfo(recipient, props);
-
         deviceMgtService.sendRegistrationEmail(metaInfo);
         Assert.assertTrue(true);
     }