Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Address some comments on IpManagerTest" am: b2afa1ede5

Browse Source 
am: dea2371e71

Change-Id: Iac9eccca662fccc2da7d81c6d86d1623cccef342
This commit is contained in:
Erik Kline
2017-03-14 06:13:10 +00:00
committed by android-build-merger
parent 4e8ae3eddc dea2371e71
commit eb04c52063
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/java/android/net/ip/IpManagerTest.java
View File

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