From 8abe0dfb92c5ded84ea569ee9dfa61e13d7ce73c Mon Sep 17 00:00:00 2001 From: Weng Su Date: Tue, 30 Mar 2021 03:31:50 +0800 Subject: [PATCH] Fix WifiTetherPasswordPreferenceControllerTest failed - Use the same service name(WifiManager.class) to mock WifiManager.class - Use the same service name(TetheringManager.class) to mock TetheringManager.class Bug: 183921878 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPasswordPreferenceControllerTest Change-Id: Ib6ec5a806b10e73a5fefd4acf070a4ab1f69e0d7 --- .../tether/WifiTetherPasswordPreferenceControllerTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java index 8f8477fcff7..bb61eb9dc2c 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java @@ -19,6 +19,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -75,9 +76,9 @@ public class WifiTetherPasswordPreferenceControllerTest { .setPassphrase(INITIAL_PASSWORD, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK) .build(); - when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); + doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class); when(mWifiManager.getSoftApConfiguration()).thenReturn(mConfig); - when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); + doReturn(mTetheringManager).when(mContext).getSystemService(TetheringManager.class); when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources()); when(mScreen.findPreference(anyString())).thenReturn(mPreference);