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

Commit 287207c9 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Make testVpnNetworkActive more deterministic. am: d2adbfbf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425313

Change-Id: I5b7901958bf96b0cee80c6124e004e57da0992cd
parents 635e0638 d2adbfbf

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

+4 −10
Original line number Diff line number Diff line
@@ -5423,6 +5423,7 @@ public class ConnectivityServiceTest { 


        final Set<UidRange> ranges = uidRangesForUid(uid);

        mMockVpn.registerAgent(ranges);

        mService.setUnderlyingNetworksForVpn(new Network[0]);



        // VPN networks do not satisfy the default request and are automatically validated

        // by NetworkMonitor
@@ -5431,19 +5432,12 @@ public class ConnectivityServiceTest { 
        mMockVpn.getAgent().setNetworkValid(false /* isStrictMode */);



        mMockVpn.connect(false);

        mService.setUnderlyingNetworksForVpn(new Network[0]);



        genericNetworkCallback.expectAvailableCallbacksUnvalidated(mMockVpn);

        genericNetworkCallback.expectAvailableThenValidatedCallbacks(mMockVpn);

        genericNotVpnNetworkCallback.assertNoCallback();

        wifiNetworkCallback.assertNoCallback();

        vpnNetworkCallback.expectAvailableCallbacksUnvalidated(mMockVpn);

        defaultCallback.expectAvailableCallbacksUnvalidated(mMockVpn);

        assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork());



        genericNetworkCallback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, mMockVpn);

        genericNotVpnNetworkCallback.assertNoCallback();

        vpnNetworkCallback.expectCapabilitiesThat(mMockVpn, nc -> null == nc.getUids());

        defaultCallback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, mMockVpn);

        vpnNetworkCallback.expectAvailableThenValidatedCallbacks(mMockVpn);

        defaultCallback.expectAvailableThenValidatedCallbacks(mMockVpn);

        assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork());



        ranges.clear();