PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the broken test on WifiSettingsTest" into sc-dev

Browse Source
This commit is contained in:
Weng Su
2021-03-30 03:03:36 +00:00
committed by Android (Google) Code Review
parent 39bc92d1bc b91aa1edba
commit ae80253161
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
View File

@@ -43,6 +43,7 @@ import android.os.Bundle;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.util.FeatureFlagUtils;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.View; import android.view.View;
@@ -105,6 +106,7 @@ public class WifiSettingsTest {
mWifiSettings.mConfigureWifiSettingsPreference = new Preference(mContext); mWifiSettings.mConfigureWifiSettingsPreference = new Preference(mContext);
mWifiSettings.mWifiPickerTracker = mMockWifiPickerTracker; mWifiSettings.mWifiPickerTracker = mMockWifiPickerTracker;
mWifiSettings.mWifiManager = mWifiManager; mWifiSettings.mWifiManager = mWifiManager;
FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false);
} }
@Test @Test
@@ -209,7 +211,7 @@ public class WifiSettingsTest {
final Resources.Theme theme = mContext.getTheme(); final Resources.Theme theme = mContext.getTheme();
when(activity.getTheme()).thenReturn(theme); when(activity.getTheme()).thenReturn(theme);
UserManager userManager = mock(UserManager.class); UserManager userManager = mock(UserManager.class);
when(activity.getSystemService(UserManager.class)) when(activity.getSystemService(Context.USER_SERVICE))
.thenReturn(userManager); .thenReturn(userManager);
when(mWifiSettings.findPreference(WifiSettings.PREF_KEY_DATA_USAGE)) when(mWifiSettings.findPreference(WifiSettings.PREF_KEY_DATA_USAGE))