From ca9bc9e0d2391c595c80b9f94c485f084cce6cd5 Mon Sep 17 00:00:00 2001 From: Yohan Avishke Date: Sat, 4 Apr 2020 11:20:06 +0530 Subject: [PATCH] Sync with core --- .../DeviceManagementProviderServiceMock.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java index e7d590123..6664ba5bc 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java @@ -15,6 +15,23 @@ * specific language governing permissions and limitations * under the License. */ +/* + * Copyright (c) 2020, 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.mdm.services.android.mocks; @@ -58,8 +75,9 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.service.EmailMetaInfo; import org.wso2.carbon.mdm.services.android.utils.TestUtils; +import org.apache.commons.collections.map.SingletonMap; + import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -304,7 +322,7 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv } @Override - public HashMap getTenantedDevice(DeviceIdentifier deviceIdentifier) + public SingletonMap getTenantedDevice(DeviceIdentifier deviceIdentifier, boolean b) throws DeviceManagementException { return null; }