Merge "Address some comments on IpManagerTest"

am: b2afa1ede5

Change-Id: Ic986c23c693757b8311e0de0c0a94281db67f62d
This commit is contained in:
Erik Kline
2017-03-14 06:08:34 +00:00
committed by android-build-merger

View File

@@ -38,12 +38,12 @@ import org.mockito.MockitoAnnotations;
/**
* Tests for IpManager.
*
* @hide
*/
@RunWith(AndroidJUnit4.class)
@SmallTest
public class IpManagerTest {
private static final int DEFAULT_AVOIDBADWIFI_CONFIG_VALUE = 1;
@Mock private Context mContext;
@Mock private INetworkManagementService mNMService;
@Mock private Resources mResources;
@@ -54,7 +54,7 @@ public class IpManagerTest {
when(mContext.getResources()).thenReturn(mResources);
when(mResources.getInteger(R.integer.config_networkAvoidBadWifi))
.thenReturn(0);
.thenReturn(DEFAULT_AVOIDBADWIFI_CONFIG_VALUE);
mContentResolver = new MockContentResolver();
mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());