From b91aa1edba7eb281d891f53f8f2cc7b2ceb583bd Mon Sep 17 00:00:00 2001 From: Weng Su Date: Tue, 30 Mar 2021 01:44:50 +0800 Subject: [PATCH] Fix the broken test on WifiSettingsTest - Use the same service name(Context.USER_SERVICE) to mock UserManager.class - Set the Provider Model feature flag to false Bug: 183921235 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest Change-Id: I7f83431c08f1e2bd61be0d4b7894116fa7d60168 --- .../src/com/android/settings/wifi/WifiSettingsTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index 428a3600a13..1f5abd3d72e 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -43,6 +43,7 @@ import android.os.Bundle; import android.os.PowerManager; import android.os.UserManager; import android.provider.Settings; +import android.util.FeatureFlagUtils; import android.view.ContextMenu; import android.view.View; @@ -105,6 +106,7 @@ public class WifiSettingsTest { mWifiSettings.mConfigureWifiSettingsPreference = new Preference(mContext); mWifiSettings.mWifiPickerTracker = mMockWifiPickerTracker; mWifiSettings.mWifiManager = mWifiManager; + FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false); } @Test @@ -209,7 +211,7 @@ public class WifiSettingsTest { final Resources.Theme theme = mContext.getTheme(); when(activity.getTheme()).thenReturn(theme); UserManager userManager = mock(UserManager.class); - when(activity.getSystemService(UserManager.class)) + when(activity.getSystemService(Context.USER_SERVICE)) .thenReturn(userManager); when(mWifiSettings.findPreference(WifiSettings.PREF_KEY_DATA_USAGE))