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

Commit a6824ccb authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Rubin Xu
Browse files

Revert new tests and PackageManager mock 

A mocked PackageManager caused test failures in existing tests.
Revert that for now to make tests pass again.

Bug: 114231106
Bug: 130397860
Test: atest FrameworksNetTests

Merged-In: Ib59e211d4329f885108de9ea0a74669ffb144e17
(cherry picked from commit 8574c9bf)

Change-Id: I603a0b0dfb67a942679a668c182aa650774c80b2
parent 9a3f7245

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

+6 −15
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.server;



import static android.content.pm.PackageManager.GET_PERMISSIONS;

import static android.content.pm.PackageManager.MATCH_ANY_USER;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;

import static android.net.ConnectivityManager.NETID_UNSET;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
@@ -105,7 +103,6 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.net.ConnectivityManager;
@@ -274,7 +271,6 @@ public class ConnectivityServiceTest { 
    @Mock IDnsResolver mMockDnsResolver;

    @Mock INetd mMockNetd;

    @Mock NetworkStackClient mNetworkStack;

    @Mock PackageManager mPackageManager;

    @Mock UserManager mUserManager;



    private ArgumentCaptor<String[]> mStringArrayCaptor = ArgumentCaptor.forClass(String[].class);
@@ -359,11 +355,6 @@ public class ConnectivityServiceTest { 
        public Resources getResources() {

            return mResources;

        }



        @Override

        public PackageManager getPackageManager() {

            return mPackageManager;

        }

    }



    public void waitForIdle(int timeoutMsAsInt) {
@@ -1233,12 +1224,6 @@ public class ConnectivityServiceTest { 
                Arrays.asList(new UserInfo[] {

                        new UserInfo(VPN_USER, "", 0),

                }));

        when(mPackageManager.getInstalledPackages(eq(GET_PERMISSIONS | MATCH_ANY_USER))).thenReturn(

                Arrays.asList(new PackageInfo[] {

                        buildPackageInfo(/* SYSTEM */ false, APP1_UID),

                        buildPackageInfo(/* SYSTEM */ false, APP2_UID),

                        buildPackageInfo(/* SYSTEM */ false, VPN_UID)

                }));



        // InstrumentationTestRunner prepares a looper, but AndroidJUnitRunner does not.

        // http://b/25897652 .
@@ -6168,6 +6153,7 @@ public class ConnectivityServiceTest { 
    }



    @Test

    @Ignore

    public void testFullyRoutedVpnResultsInInterfaceFilteringRules() throws Exception {

        LinkProperties lp = new LinkProperties();

        lp.setInterfaceName("tun0");
@@ -6194,6 +6180,7 @@ public class ConnectivityServiceTest { 
    }



    @Test

    @Ignore

    public void testLegacyVpnDoesNotResultInInterfaceFilteringRule() throws Exception {

        LinkProperties lp = new LinkProperties();

        lp.setInterfaceName("tun0");
@@ -6206,6 +6193,8 @@ public class ConnectivityServiceTest { 
        verify(mMockNetd, never()).firewallAddUidInterfaceRules(any(), any());

    }



    @Test

    @Ignore

    public void testLocalIpv4OnlyVpnDoesNotResultInInterfaceFilteringRule()

            throws Exception {

        LinkProperties lp = new LinkProperties();
@@ -6221,6 +6210,7 @@ public class ConnectivityServiceTest { 
    }



    @Test

    @Ignore

    public void testVpnHandoverChangesInterfaceFilteringRule() throws Exception {

        LinkProperties lp = new LinkProperties();

        lp.setInterfaceName("tun0");
@@ -6270,6 +6260,7 @@ public class ConnectivityServiceTest { 
    }



    @Test

    @Ignore

    public void testUidUpdateChangesInterfaceFilteringRule() throws Exception {

        LinkProperties lp = new LinkProperties();

        lp.setInterfaceName("tun0");