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

Merge "Get ConnectivityServiceTest building again after 8f80cc8."

Browse Source
This commit is contained in:
Lorenzo Colitti
2014-05-14 12:44:40 +00:00
committed by Android (Google) Code Review
parent dffe0236c6 a7b9796345
commit 8f677677ec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
View File

@@ -165,7 +165,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
// verify that both routes were added and DNS was flushed
verify(mNetManager).addRoute(eq(MOBILE_IFACE), eq(MOBILE_ROUTE_V4));
verify(mNetManager).addRoute(eq(MOBILE_IFACE), eq(MOBILE_ROUTE_V6));
verify(mNetManager).flushInterfaceDnsCache(MOBILE_IFACE);
verify(mNetManager).flushNetworkDnsCache(mMobile.tracker.getNetwork().netId);
}
@@ -202,7 +202,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
// verify that wifi routes added, and teardown requested
verify(mNetManager).addRoute(eq(WIFI_IFACE), eq(WIFI_ROUTE_V4));
verify(mNetManager).addRoute(eq(WIFI_IFACE), eq(WIFI_ROUTE_V6));
verify(mNetManager).flushInterfaceDnsCache(WIFI_IFACE);
verify(mNetManager).flushNetworkDnsCache(mWifi.tracker.getNetwork().netId);
verify(mMobile.tracker).teardown();
reset(mNetManager, mMobile.tracker);