Merge branch 'master' into 'master'

Implement device type delete method in the mock implementation

See merge request entgra/carbon-device-mgt-plugins!127

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.core/src/test/java/org/wso2/carbon/device/mgt/mobile/android/core/mokcs/DeviceManagementProviderServiceMock.java

@@ -15,6 +15,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/*
+ *   Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ *   Entgra (Pvt) Ltd. 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.mobile.android.core.mokcs;
 
@@ -61,6 +78,17 @@ import java.util.List;
 import java.util.Map;
 
 public class DeviceManagementProviderServiceMock implements DeviceManagementProviderService {
+    @Override
+    public boolean deleteDeviceTypeVersions(DeviceType deviceType)
+            throws DeviceManagementException {
+        return false;
+    }
+
+    @Override
+    public void disEnrollDevices(List<Device> list) throws DeviceManagementException {
+
+    }
+
     @Override
     public List<Device> getAllDevices(String s) throws DeviceManagementException {
         return null;
@@ -661,6 +689,12 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return null;
     }
 
+    @Override
+    public boolean deleteDeviceType(String s, DeviceType deviceType)
+            throws DeviceManagementException {
+        return false;
+    }
+
     @Override
     public DeviceConfiguration getDeviceConfiguration(Map<String, String> propertyMap)
             throws DeviceManagementException, DeviceNotFoundException, UnauthorizedDeviceAccessException,