From 416bdecfa4722ea4566c6f1e189d32c0c33676aa Mon Sep 17 00:00:00 2001 From: Weng Su Date: Tue, 30 Mar 2021 04:02:24 +0800 Subject: [PATCH] Fix WifiTetherSettingsTest failed - Use the same service name(Context.USER_SERVICE) to mock UserManager.class Bug: 183922231 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest Change-Id: Ifa9f3affbb969425acea335732ce977f18f82b49 --- .../android/settings/wifi/tether/WifiTetherSettingsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java index 9a3432392f0..c124c96ddb6 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java @@ -83,7 +83,7 @@ public class WifiTetherSettingsTest { .when(mContext).getSystemService(ConnectivityManager.class); doReturn(mTetheringManager).when(mContext).getSystemService(TetheringManager.class); doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs(); - doReturn(mUserManager).when(mContext).getSystemService(UserManager.class); + doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE); mWifiTetherSettings = new WifiTetherSettings(); } @@ -133,7 +133,7 @@ public class WifiTetherSettingsTest { when(settings.getContext()).thenReturn(mContext); final Resources.Theme theme = mContext.getTheme(); when(activity.getTheme()).thenReturn(theme); - when(activity.getSystemService(UserManager.class)).thenReturn(mUserManager); + when(activity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); doNothing().when(settings) .onCreatePreferences(any(Bundle.class), nullable(String.class)); final FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest();