Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
be1b2f307d
@@ -88,6 +88,8 @@ public class NetworkProviderSettingsTest {
|
|||||||
@Mock
|
@Mock
|
||||||
private WifiManager mWifiManager;
|
private WifiManager mWifiManager;
|
||||||
@Mock
|
@Mock
|
||||||
|
private UserManager mUserManager;
|
||||||
|
@Mock
|
||||||
private DataUsagePreference mDataUsagePreference;
|
private DataUsagePreference mDataUsagePreference;
|
||||||
private Context mContext;
|
private Context mContext;
|
||||||
private NetworkProviderSettings mNetworkProviderSettings;
|
private NetworkProviderSettings mNetworkProviderSettings;
|
||||||
@@ -115,6 +117,8 @@ public class NetworkProviderSettingsTest {
|
|||||||
doReturn(mPreferenceManager).when(mNetworkProviderSettings).getPreferenceManager();
|
doReturn(mPreferenceManager).when(mNetworkProviderSettings).getPreferenceManager();
|
||||||
doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
|
doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
|
||||||
doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
|
doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
|
||||||
|
doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
|
||||||
|
when(mUserManager.hasBaseUserRestriction(any(), any())).thenReturn(true);
|
||||||
doReturn(mContext).when(mPreferenceManager).getContext();
|
doReturn(mContext).when(mPreferenceManager).getContext();
|
||||||
mNetworkProviderSettings.mAddWifiNetworkPreference = new AddWifiNetworkPreference(mContext);
|
mNetworkProviderSettings.mAddWifiNetworkPreference = new AddWifiNetworkPreference(mContext);
|
||||||
mNetworkProviderSettings.mSavedNetworksPreference = new Preference(mContext);
|
mNetworkProviderSettings.mSavedNetworksPreference = new Preference(mContext);
|
||||||
|
Reference in New Issue
Block a user