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

Commit 98d80dbf authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Test extra info sent to NetworkMonitor" am: 4f45ccd4 am: dbcfe362... 

Merge "Test extra info sent to NetworkMonitor" am: 4f45ccd4 am: dbcfe362 am: 43b8b17a am: 0f59df5b

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

Change-Id: I860a85ee44c7fb3d6707bdae637c52c6796324b1
parents 732d39aa 0f59df5b

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

+27 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import static org.mockito.ArgumentMatchers.anyLong; 
import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.argThat;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.ArgumentMatchers.startsWith;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.any;
@@ -164,6 +165,8 @@ import android.net.LinkAddress; 
import android.net.LinkProperties;

import android.net.MatchAllNetworkSpecifier;

import android.net.Network;

import android.net.NetworkAgent;

import android.net.NetworkAgentConfig;

import android.net.NetworkCapabilities;

import android.net.NetworkFactory;

import android.net.NetworkInfo;
@@ -6808,6 +6811,30 @@ public class ConnectivityServiceTest { 
        assertEquals(wifiLp, mService.getActiveLinkProperties());

    }



    @Test

    public void testLegacyExtraInfoSentToNetworkMonitor() throws Exception {

        class TestNetworkAgent extends NetworkAgent {

            TestNetworkAgent(Context context, Looper looper, NetworkAgentConfig config) {

                super(context, looper, "MockAgent", new NetworkCapabilities(),

                        new LinkProperties(), 40 , config, null /* provider */);

            }

        }

        final NetworkAgent naNoExtraInfo = new TestNetworkAgent(

                mServiceContext, mCsHandlerThread.getLooper(), new NetworkAgentConfig());

        naNoExtraInfo.register();

        verify(mNetworkStack).makeNetworkMonitor(any(), isNull(String.class), any());

        naNoExtraInfo.unregister();



        reset(mNetworkStack);

        final NetworkAgentConfig config =

                new NetworkAgentConfig.Builder().setLegacyExtraInfo("legacyinfo").build();

        final NetworkAgent naExtraInfo = new TestNetworkAgent(

                mServiceContext, mCsHandlerThread.getLooper(), config);

        naExtraInfo.register();

        verify(mNetworkStack).makeNetworkMonitor(any(), eq("legacyinfo"), any());

        naExtraInfo.unregister();

    }



    private void setupLocationPermissions(

            int targetSdk, boolean locationToggle, String op, String perm) throws Exception {

        final ApplicationInfo applicationInfo = new ApplicationInfo();