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

IpManager: fix test for default ProvisioningConfiguration

Browse Source 
The test did not properly account for the stopAllIP() done in starting
state of the IpManager state machine, which could cause assertions to
fail when stopAllIP() is called again after stop().

Bug: 62988545
Test: runtest frameworks-net
Change-Id: I2c6eb76461a81c1d743bf448da36c58a99ce082d
This commit is contained in:
Hugo Benichi
2017-07-18 16:17:49 +09:00
parent d2c8dcfcfe
commit c10fe5f463
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)