From 98746308cc45727c529b49bc88e16448918f5791 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Tue, 30 Mar 2021 03:17:52 +0800 Subject: [PATCH] Fix WifiTetherFooterPreferenceControllerTest failed - Use the same service name(WifiManager.class) to mock WifiManager.class - Use the same service name(TetheringManager.class) to mock TetheringManager.class Bug: 183921868 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest Change-Id: I904c463f555c3c3c2a85272505215cf993474a7a --- .../wifi/tether/WifiTetherFooterPreferenceControllerTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java index a42307193ec..c1d6c16a687 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -57,7 +58,8 @@ public class WifiTetherFooterPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); - when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); + doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class); + doReturn(mTetheringManager).when(mContext).getSystemService(TetheringManager.class); when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); mController = new WifiTetherFooterPreferenceController(mContext);