Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07133093 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Fix build."

parents 4a0e0173 4ddebf7f

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

+12 −8
Original line number Original line Diff line number Diff line
@@ -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));





    }

    }