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

Merge "IpManager: fix test for default ProvisioningConfiguration" am: 2627d4856b

Browse Source 
am: 361162b636

Change-Id: Id72cd94c481bdc106ed022582399687b9abcc22b
This commit is contained in:
Hugo Benichi
2017-07-19 01:15:12 +00:00
committed by android-build-merger
parent ad737afc4c 361162b636
commit fe88fa947e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,8 @@ public class IpManagerTest {
@Mock private AlarmManager mAlarm;
private MockContentResolver mContentResolver;
@Before public void setUp() throws Exception {
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
when(mContext.getSystemService(eq(Context.ALARM_SERVICE))).thenReturn(mAlarm);
@@ -88,6 +89,13 @@ public class IpManagerTest {
when(mContext.getContentResolver()).thenReturn(mContentResolver);
}
private IpManager makeIpManager(String ifname) throws Exception {
final IpManager ipm = new IpManager(mContext, ifname, mCb, mNMService);
verify(mNMService, timeout(100).times(1)).disableIpv6(ifname);
verify(mNMService, timeout(100).times(1)).clearInterfaceAddresses(ifname);
return ipm;
}
@Test
public void testNullCallbackDoesNotThrow() throws Exception {
final IpManager ipm = new IpManager(mContext, "lo", null, mNMService);
@@ -101,7 +109,8 @@ public class IpManagerTest {
@Test
public void testDefaultProvisioningConfiguration() throws Exception {
final String iface = "test_wlan0";
final IpManager ipm = new IpManager(mContext, iface, mCb, mNMService);
final IpManager ipm = makeIpManager(iface);
ProvisioningConfiguration config = new ProvisioningConfiguration.Builder()
.withoutIPv4()
// TODO: mock IpReachabilityMonitor's dependencies (NetworkInterface, PowerManager)