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

Commit 8cbf5883 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Add unit tests for onBlockedStatusChanged(Network, int). 

Bug: 165835257
Test: atest FrameworksNetTests
Change-Id: I0597df71aa94817835d7a2fb54bfcf9222a34b64
parent 5ab70251

tests/net/java/com/android/server/ConnectivityServiceTest.java

+40 −0
Original line number Diff line number Diff line
@@ -7277,6 +7277,20 @@ public class ConnectivityServiceTest { 
        mMockVpn.disconnect();

    }













    private class DetailedBlockedStatusCallback extends TestNetworkCallback {













        public void expectAvailableThenValidatedCallbacks(HasNetwork n, int blockedStatus) {













            super.expectAvailableThenValidatedCallbacks(n.getNetwork(), blockedStatus, TIMEOUT_MS);













        }













        public void expectBlockedStatusCallback(HasNetwork n, int blockedStatus) {













            // This doesn't work:













            // super.expectBlockedStatusCallback(blockedStatus, n.getNetwork());













            super.expectBlockedStatusCallback(blockedStatus, n.getNetwork(), TIMEOUT_MS);













        }













        public void onBlockedStatusChanged(Network network, int blockedReasons) {













            getHistory().add(new CallbackEntry.BlockedStatusInt(network, blockedReasons));













        }













    }



























    @Test















    public void testNetworkBlockedStatus() throws Exception {















        final TestNetworkCallback cellNetworkCallback = new TestNetworkCallback();









@@ -7284,11 +7298,16 @@ public class ConnectivityServiceTest {













                .addTransportType(TRANSPORT_CELLULAR)















                .build();















        mCm.registerNetworkCallback(cellRequest, cellNetworkCallback);













        final DetailedBlockedStatusCallback detailedCallback = new DetailedBlockedStatusCallback();













        mCm.registerNetworkCallback(cellRequest, detailedCallback);



























        mockUidNetworkingBlocked();





























        mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);















        mCellNetworkAgent.connect(true);















        cellNetworkCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);













        detailedCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent,













                BLOCKED_REASON_NONE);















        assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());















        assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);















        assertNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);









@@ -7296,16 +7315,23 @@ public class ConnectivityServiceTest {



























        setBlockedReasonChanged(BLOCKED_REASON_BATTERY_SAVER);















        cellNetworkCallback.expectBlockedStatusCallback(true, mCellNetworkAgent);













        detailedCallback.expectBlockedStatusCallback(mCellNetworkAgent,













                BLOCKED_REASON_BATTERY_SAVER);















        assertNull(mCm.getActiveNetwork());















        assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.BLOCKED);















        assertNetworkInfo(TYPE_MOBILE, DetailedState.BLOCKED);















        assertExtraInfoFromCmBlocked(mCellNetworkAgent);



























        // If blocked state does not change but blocked reason does, the boolean callback is called.













        // TODO: investigate de-duplicating.















        setBlockedReasonChanged(BLOCKED_METERED_REASON_USER_RESTRICTED);















        cellNetworkCallback.expectBlockedStatusCallback(true, mCellNetworkAgent);













        detailedCallback.expectBlockedStatusCallback(mCellNetworkAgent,













                BLOCKED_METERED_REASON_USER_RESTRICTED);





























        setBlockedReasonChanged(BLOCKED_REASON_NONE);















        cellNetworkCallback.expectBlockedStatusCallback(false, mCellNetworkAgent);













        detailedCallback.expectBlockedStatusCallback(mCellNetworkAgent, BLOCKED_REASON_NONE);















        assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());















        assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);















        assertNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);









@@ -7313,6 +7339,8 @@ public class ConnectivityServiceTest {



























        setBlockedReasonChanged(BLOCKED_METERED_REASON_DATA_SAVER);















        cellNetworkCallback.expectBlockedStatusCallback(true, mCellNetworkAgent);













        detailedCallback.expectBlockedStatusCallback(mCellNetworkAgent,













                BLOCKED_METERED_REASON_DATA_SAVER);















        assertNull(mCm.getActiveNetwork());















        assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.BLOCKED);















        assertNetworkInfo(TYPE_MOBILE, DetailedState.BLOCKED);









@@ -7322,6 +7350,8 @@ public class ConnectivityServiceTest {













        mCellNetworkAgent.addCapability(NET_CAPABILITY_NOT_METERED);















        cellNetworkCallback.expectCapabilitiesWith(NET_CAPABILITY_NOT_METERED, mCellNetworkAgent);















        cellNetworkCallback.expectBlockedStatusCallback(false, mCellNetworkAgent);













        detailedCallback.expectCapabilitiesWith(NET_CAPABILITY_NOT_METERED, mCellNetworkAgent);













        detailedCallback.expectBlockedStatusCallback(mCellNetworkAgent, BLOCKED_REASON_NONE);















        assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());















        assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);















        assertNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);









@@ -7331,6 +7361,10 @@ public class ConnectivityServiceTest {













        cellNetworkCallback.expectCapabilitiesWithout(NET_CAPABILITY_NOT_METERED,















                mCellNetworkAgent);















        cellNetworkCallback.expectBlockedStatusCallback(true, mCellNetworkAgent);













        detailedCallback.expectCapabilitiesWithout(NET_CAPABILITY_NOT_METERED,













                mCellNetworkAgent);













        detailedCallback.expectBlockedStatusCallback(mCellNetworkAgent,













                BLOCKED_METERED_REASON_DATA_SAVER);















        assertNull(mCm.getActiveNetwork());















        assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.BLOCKED);















        assertNetworkInfo(TYPE_MOBILE, DetailedState.BLOCKED);









@@ -7338,6 +7372,7 @@ public class ConnectivityServiceTest {



























        setBlockedReasonChanged(BLOCKED_REASON_NONE);















        cellNetworkCallback.expectBlockedStatusCallback(false, mCellNetworkAgent);













        detailedCallback.expectBlockedStatusCallback(mCellNetworkAgent, BLOCKED_REASON_NONE);















        assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());















        assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);















        assertNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);









@@ -7345,10 +7380,13 @@ public class ConnectivityServiceTest {



























        setBlockedReasonChanged(BLOCKED_REASON_NONE);















        cellNetworkCallback.assertNoCallback();













        detailedCallback.assertNoCallback();





























        // Restrict background data. Networking is not blocked because the network is unmetered.















        setBlockedReasonChanged(BLOCKED_METERED_REASON_DATA_SAVER);















        cellNetworkCallback.expectBlockedStatusCallback(true, mCellNetworkAgent);













        detailedCallback.expectBlockedStatusCallback(mCellNetworkAgent,













                BLOCKED_METERED_REASON_DATA_SAVER);















        assertNull(mCm.getActiveNetwork());















        assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.BLOCKED);















        assertNetworkInfo(TYPE_MOBILE, DetailedState.BLOCKED);









@@ -7358,12 +7396,14 @@ public class ConnectivityServiceTest {



























        setBlockedReasonChanged(BLOCKED_REASON_NONE);















        cellNetworkCallback.expectBlockedStatusCallback(false, mCellNetworkAgent);













        detailedCallback.expectBlockedStatusCallback(mCellNetworkAgent, BLOCKED_REASON_NONE);















        assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);















        assertNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);















        assertExtraInfoFromCmPresent(mCellNetworkAgent);





























        setBlockedReasonChanged(BLOCKED_REASON_NONE);















        cellNetworkCallback.assertNoCallback();













        detailedCallback.assertNoCallback();















        assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork());















        assertActiveNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);















        assertNetworkInfo(TYPE_MOBILE, DetailedState.CONNECTED);