From c10fe5f463676a05ecd3f76a5f7037700ea49b0d Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 18 Jul 2017 16:17:49 +0900 Subject: IpManager: fix test for default ProvisioningConfiguration 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 --- tests/net/java/android/net/ip/IpManagerTest.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/net/java/android/net/ip/IpManagerTest.java b/tests/net/java/android/net/ip/IpManagerTest.java index e7dbfe3f5044..867324d99920 100644 --- a/tests/net/java/android/net/ip/IpManagerTest.java +++ b/tests/net/java/android/net/ip/IpManagerTest.java @@ -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) -- cgit v1.2.3-59-g8ed1b