LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build.

Browse Source 
Change-Id: I5dab09d2d8a9cff56fa17bb4e8c14b365449399b
This commit is contained in:
Sreeram Ramachandran
2014-04-16 10:56:07 -07:00
committed by Lorenzo Colitti
parent 9676566151
commit 2a9d35f655
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,9 +163,10 @@ public class ConnectivityServiceTest extends AndroidTestCase {
nextConnBroadcast.get(); nextConnBroadcast.get();
// verify that both routes were added and DNS was flushed // verify that both routes were added and DNS was flushed
verify(mNetManager).addRoute(eq(MOBILE_IFACE), eq(MOBILE_ROUTE_V4)); int mobileNetId = mMobile.tracker.getNetwork().netId;
verify(mNetManager).addRoute(eq(MOBILE_IFACE), eq(MOBILE_ROUTE_V6)); verify(mNetManager).addRoute(eq(mobileNetId), eq(MOBILE_ROUTE_V4));
verify(mNetManager).flushNetworkDnsCache(mMobile.tracker.getNetwork().netId); verify(mNetManager).addRoute(eq(mobileNetId), eq(MOBILE_ROUTE_V6));
verify(mNetManager).flushNetworkDnsCache(mobileNetId);
} }
@@ -200,11 +201,14 @@ public class ConnectivityServiceTest extends AndroidTestCase {
nextConnBroadcast.get(); nextConnBroadcast.get();
// verify that wifi routes added, and teardown requested // verify that wifi routes added, and teardown requested
verify(mNetManager).addRoute(eq(WIFI_IFACE), eq(WIFI_ROUTE_V4)); int wifiNetId = mWifi.tracker.getNetwork().netId;
verify(mNetManager).addRoute(eq(WIFI_IFACE), eq(WIFI_ROUTE_V6)); verify(mNetManager).addRoute(eq(wifiNetId), eq(WIFI_ROUTE_V4));
verify(mNetManager).flushNetworkDnsCache(mWifi.tracker.getNetwork().netId); verify(mNetManager).addRoute(eq(wifiNetId), eq(WIFI_ROUTE_V6));
verify(mNetManager).flushNetworkDnsCache(wifiNetId);
verify(mMobile.tracker).teardown(); verify(mMobile.tracker).teardown();
int mobileNetId = mMobile.tracker.getNetwork().netId;
reset(mNetManager, mMobile.tracker); reset(mNetManager, mMobile.tracker);
// tear down mobile network, as requested // tear down mobile network, as requested
@@ -216,8 +220,8 @@ public class ConnectivityServiceTest extends AndroidTestCase {
mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget(); mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();
nextConnBroadcast.get(); nextConnBroadcast.get();
verify(mNetManager).removeRoute(eq(MOBILE_IFACE), eq(MOBILE_ROUTE_V4)); verify(mNetManager).removeRoute(eq(mobileNetId), eq(MOBILE_ROUTE_V4));
verify(mNetManager).removeRoute(eq(MOBILE_IFACE), eq(MOBILE_ROUTE_V6)); verify(mNetManager).removeRoute(eq(mobileNetId), eq(MOBILE_ROUTE_V6));
} }