Original change: undetermined

Change-Id: I621e377cef0989f4bc97e23f71b6b4075b2afd8a
This commit is contained in:
Sreeram Ramachandran
2021-05-31 07:20:21 +00:00
committed by Automerger Merge Worker

View File

@@ -163,9 +163,10 @@ public class ConnectivityServiceTest extends AndroidTestCase {
nextConnBroadcast.get();
// 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).flushNetworkDnsCache(mMobile.tracker.getNetwork().netId);
int mobileNetId = mMobile.tracker.getNetwork().netId;
verify(mNetManager).addRoute(eq(mobileNetId), eq(MOBILE_ROUTE_V4));
verify(mNetManager).addRoute(eq(mobileNetId), eq(MOBILE_ROUTE_V6));
verify(mNetManager).flushNetworkDnsCache(mobileNetId);
}
@@ -200,11 +201,14 @@ public class ConnectivityServiceTest extends AndroidTestCase {
nextConnBroadcast.get();
// 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).flushNetworkDnsCache(mWifi.tracker.getNetwork().netId);
int wifiNetId = mWifi.tracker.getNetwork().netId;
verify(mNetManager).addRoute(eq(wifiNetId), eq(WIFI_ROUTE_V4));
verify(mNetManager).addRoute(eq(wifiNetId), eq(WIFI_ROUTE_V6));
verify(mNetManager).flushNetworkDnsCache(wifiNetId);
verify(mMobile.tracker).teardown();
int mobileNetId = mMobile.tracker.getNetwork().netId;
reset(mNetManager, mMobile.tracker);
// tear down mobile network, as requested
@@ -216,8 +220,8 @@ public class ConnectivityServiceTest extends AndroidTestCase {
mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();
nextConnBroadcast.get();
verify(mNetManager).removeRoute(eq(MOBILE_IFACE), eq(MOBILE_ROUTE_V4));
verify(mNetManager).removeRoute(eq(MOBILE_IFACE), eq(MOBILE_ROUTE_V6));
verify(mNetManager).removeRoute(eq(mobileNetId), eq(MOBILE_ROUTE_V4));
verify(mNetManager).removeRoute(eq(mobileNetId), eq(MOBILE_ROUTE_V6));
}