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

Commit 4f45ccd4 authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Test extra info sent to NetworkMonitor"

parents 7efd5a48 2153861f

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

+27 −0
Original line number Original line 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.anyString;

import static org.mockito.ArgumentMatchers.argThat;

import static org.mockito.ArgumentMatchers.argThat;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.ArgumentMatchers.startsWith;

import static org.mockito.ArgumentMatchers.startsWith;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.any;

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

import android.net.LinkProperties;

import android.net.MatchAllNetworkSpecifier;

import android.net.MatchAllNetworkSpecifier;

import android.net.Network;

import android.net.Network;

import android.net.NetworkAgent;

import android.net.NetworkAgentConfig;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;

import android.net.NetworkFactory;

import android.net.NetworkFactory;

import android.net.NetworkInfo;

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

        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(

    private void setupLocationPermissions(

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

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

        final ApplicationInfo applicationInfo = new ApplicationInfo();

        final ApplicationInfo applicationInfo = new ApplicationInfo();