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

Commit eccd2623 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Test passing an underlying network array with null network in it. 

Current code treats these nulls as if they weren't there.

Bug: 172870110
Test: test-only change
Change-Id: Id4632e1b004c09910b4b7613f7233d2c19e2f0ac
Merged-In: Id4632e1b004c09910b4b7613f7233d2c19e2f0ac
parent 0b53357c

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

+24 −3
Original line number Diff line number Diff line
@@ -4896,8 +4896,6 @@ public class ConnectivityServiceTest { 


        final Network[] cellAndVpn = new Network[] {

                mCellNetworkAgent.getNetwork(), mMockVpn.getNetwork()};

        Network[] cellAndWifi = new Network[] {

                mCellNetworkAgent.getNetwork(), mWiFiNetworkAgent.getNetwork()};



        // A VPN with default (null) underlying networks sets the underlying network's interfaces...

        expectForceUpdateIfaces(cellAndVpn, MOBILE_IFNAME, Process.myUid(), VPN_IFNAME,
@@ -4907,10 +4905,13 @@ public class ConnectivityServiceTest { 
        mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI);

        mWiFiNetworkAgent.connect(false);

        mWiFiNetworkAgent.sendLinkProperties(wifiLp);

        final Network[] onlyNull = new Network[]{null};

        final Network[] wifiAndVpn = new Network[] {

                mWiFiNetworkAgent.getNetwork(), mMockVpn.getNetwork()};

        cellAndWifi = new Network[] {

        final Network[] cellAndWifi = new Network[] {

                mCellNetworkAgent.getNetwork(), mWiFiNetworkAgent.getNetwork()};

        final Network[] cellNullAndWifi = new Network[] {

                mCellNetworkAgent.getNetwork(), null, mWiFiNetworkAgent.getNetwork()};



        waitForIdle();

        assertEquals(wifiLp, mService.getActiveLinkProperties());
@@ -4936,6 +4937,13 @@ public class ConnectivityServiceTest { 
                new String[]{MOBILE_IFNAME, WIFI_IFNAME});

        reset(mStatsService);



        // Null underlying networks are ignored.

        mService.setUnderlyingNetworksForVpn(cellNullAndWifi);

        waitForIdle();

        expectForceUpdateIfaces(wifiAndVpn, MOBILE_IFNAME, Process.myUid(), VPN_IFNAME,

                new String[]{MOBILE_IFNAME, WIFI_IFNAME});

        reset(mStatsService);



        // If an underlying network disconnects, that interface should no longer be underlying.

        // This doesn't actually work because disconnectAndDestroyNetwork only notifies

        // NetworkStatsService before the underlying network is actually removed. So the underlying
@@ -4970,6 +4978,7 @@ public class ConnectivityServiceTest { 
                argThat(vpnInfos -> vpnInfos[0].underlyingIfaces.length == 1

                        && WIFI_IFNAME.equals(vpnInfos[0].underlyingIfaces[0])));

        mEthernetNetworkAgent.disconnect();

        waitForIdle();

        reset(mStatsService);



        // When a VPN declares no underlying networks (i.e., no connectivity), getAllVpnInfo
@@ -4982,6 +4991,18 @@ public class ConnectivityServiceTest { 
        waitForIdle();

        expectForceUpdateIfaces(wifiAndVpn, null);

        reset(mStatsService);



        // Specifying only a null underlying network is the same as no networks.

        mService.setUnderlyingNetworksForVpn(onlyNull);

        waitForIdle();

        expectForceUpdateIfaces(wifiAndVpn, null);

        reset(mStatsService);



        // Specifying networks that are all disconnected is the same as specifying no networks.

        mService.setUnderlyingNetworksForVpn(onlyCell);

        waitForIdle();

        expectForceUpdateIfaces(wifiAndVpn, null);

        reset(mStatsService);

    }



    @Test