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

Commit 3fdb68c2 authored by Fan Wu's avatar Fan Wu Committed by Android (Google) Code Review
Browse files

Merge "Remove LooperMode.LEGACY usage from settings/applications path." into main

parents 6ca5c992 cf3649f2

tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java

+6 −4
Original line number Diff line number Diff line
@@ -41,21 +41,24 @@ import android.os.UserManager; 


import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.LooperMode;

import org.robolectric.shadows.ShadowApplication;



import java.util.Arrays;

import java.util.Collections;



@RunWith(RobolectricTestRunner.class)

@LooperMode(LooperMode.Mode.LEGACY)

public final class AppWithAdminGrantedPermissionsCounterTest {



    @Rule

    MockitoRule mMockitoRule = MockitoJUnit.rule();



    private final String APP_1 = "app1";

    private final String APP_2 = "app2";

    private final String APP_3 = "app3";
@@ -99,7 +102,6 @@ public final class AppWithAdminGrantedPermissionsCounterTest { 


    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);



        mApp1 = buildInfo(APP_1_UID, APP_1, 0 /* flags */, Build.VERSION_CODES.M);

tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java

+14 −7
Original line number Diff line number Diff line
@@ -37,22 +37,27 @@ import android.os.UserHandle; 
import android.os.UserManager;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.LooperMode;

import org.robolectric.shadows.ShadowApplication;

import org.robolectric.android.util.concurrent.PausedExecutorService;

import org.robolectric.shadows.ShadowLooper;

import org.robolectric.shadows.ShadowPausedAsyncTask;



import java.util.Arrays;

import java.util.Collections;

import java.util.List;



@RunWith(RobolectricTestRunner.class)

@LooperMode(LooperMode.Mode.LEGACY)

public final class AppWithAdminGrantedPermissionsListerTest {



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();



    private final String APP_1 = "app1";

    private final String APP_2 = "app2";

    private final String APP_3 = "app3";
@@ -85,10 +90,12 @@ public final class AppWithAdminGrantedPermissionsListerTest { 
    private DevicePolicyManager mDevicePolicyManager;



    private List<UserAppInfo> mAppList = Collections.emptyList();

    private PausedExecutorService mExecutorService;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mExecutorService = new PausedExecutorService();

        ShadowPausedAsyncTask.overrideExecutor(mExecutorService);

    }



    @Test
@@ -185,9 +192,9 @@ public final class AppWithAdminGrantedPermissionsListerTest { 
        // List all apps installed that were granted one or more permissions by the

        // admin.

        (new AppWithAdminGrantedPermissionsListerTestable(PERMISSIONS)).execute();

        mExecutorService.runAll();

        ShadowLooper.idleMainLooper();



        // Wait for the background task to finish.

        ShadowApplication.runBackgroundTasks();

        assertThat(mAppList.size()).isEqualTo(3);

        InstalledAppListerTest.verifyListUniqueness(mAppList);

tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java

+17 −5
Original line number Diff line number Diff line
@@ -55,12 +55,15 @@ import org.junit.Rule; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.android.util.concurrent.PausedExecutorService;

import org.robolectric.annotation.Config;

import org.robolectric.annotation.LooperMode;

import org.robolectric.shadows.ShadowApplication;

import org.robolectric.shadows.ShadowLooper;

import org.robolectric.shadows.ShadowPausedAsyncTask;

import org.robolectric.util.ReflectionHelpers;



import java.util.ArrayList;
@@ -72,9 +75,11 @@ import java.util.Set; 
 * Tests for {@link ApplicationFeatureProviderImpl}.

 */

@RunWith(RobolectricTestRunner.class)

@LooperMode(LooperMode.Mode.LEGACY)

public final class ApplicationFeatureProviderImplTest {



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
@@ -114,11 +119,10 @@ public final class ApplicationFeatureProviderImplTest { 


    private int mAppCount = -1;

    private List<UserAppInfo> mAppList = null;

    private PausedExecutorService mExecutorService;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        when(mContext.getApplicationContext()).thenReturn(mContext);

        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);

        when(mContext.getSystemService(Context.LOCATION_SERVICE)).thenReturn(mLocationManager);
@@ -126,6 +130,9 @@ public final class ApplicationFeatureProviderImplTest { 


        mProvider = new ApplicationFeatureProviderImpl(mContext, mPackageManager,

                mPackageManagerService, mDevicePolicyManager, mWebViewUpdateServiceWrapper);



        mExecutorService = new PausedExecutorService();

        ShadowPausedAsyncTask.overrideExecutor(mExecutorService);

    }



    private void verifyCalculateNumberOfPolicyInstalledApps(boolean async) {
@@ -155,6 +162,8 @@ public final class ApplicationFeatureProviderImplTest { 


        mAppList = null;

        mProvider.listPolicyInstalledApps((list) -> mAppList = list);

        mExecutorService.runAll();

        ShadowLooper.idleMainLooper();

        assertThat(mAppList).isNotNull();

        assertThat(mAppList.size()).isEqualTo(1);

        assertThat(mAppList.get(0).appInfo.packageName).isEqualTo(APP_2);
@@ -231,6 +240,9 @@ public final class ApplicationFeatureProviderImplTest { 
        mAppList = null;

        mProvider.listAppsWithAdminGrantedPermissions(new String[]{PERMISSION},

                (list) -> mAppList = list);

        mExecutorService.runAll();

        ShadowLooper.idleMainLooper();



        assertThat(mAppList).isNotNull();

        assertThat(mAppList.size()).isEqualTo(2);

        assertThat(Arrays.asList(mAppList.get(0).appInfo.packageName,

tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java

+5 −2
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.mockito.ArgumentMatcher;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.LooperMode;

import org.robolectric.shadows.ShadowApplication;
@@ -65,6 +66,9 @@ import java.util.Set; 
@LooperMode(LooperMode.Mode.LEGACY)

public final class InstalledAppCounterTest {



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();



    private static final String APP_1 = "app1";

    private static final String APP_2 = "app2";

    private static final String APP_3 = "app3";
@@ -103,7 +107,6 @@ public final class InstalledAppCounterTest { 


    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);

        mFakeFeatureFlags = new FakeFeatureFlagsImpl();

        mFakeFeatureFlags.setFlag(Flags.FLAG_ARCHIVING, true);

tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java

+14 −12
Original line number Diff line number Diff line
@@ -36,15 +36,17 @@ import android.content.pm.UserInfo; 
import android.os.UserHandle;

import android.os.UserManager;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentMatcher;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.LooperMode;

import org.robolectric.shadows.ShadowApplication;

import org.robolectric.android.util.concurrent.PausedExecutorService;

import org.robolectric.shadows.ShadowLooper;

import org.robolectric.shadows.ShadowPausedAsyncTask;



import java.util.Arrays;

import java.util.Collections;
@@ -53,9 +55,11 @@ import java.util.List; 
import java.util.Set;



@RunWith(RobolectricTestRunner.class)

@LooperMode(LooperMode.Mode.LEGACY)

public final class InstalledAppListerTest {



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();



    private final String APP_1 = "app1";

    private final String APP_2 = "app2";

    private final String APP_3 = "app3";
@@ -77,11 +81,6 @@ public final class InstalledAppListerTest { 


    private List<UserAppInfo> mInstalledAppList = Collections.emptyList();



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

    }



    private void expectQueryIntentActivities(int userId, String packageName, boolean launchable) {

        when(mPackageManager.queryIntentActivitiesAsUser(

                argThat(isLaunchIntentFor(packageName)),
@@ -94,6 +93,9 @@ public final class InstalledAppListerTest { 


    @Test

    public void testCountInstalledAppsAcrossAllUsers() {

        PausedExecutorService executorService = new PausedExecutorService();

        ShadowPausedAsyncTask.overrideExecutor(executorService);



        // There are two users.

        when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(

                new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
@@ -155,8 +157,8 @@ public final class InstalledAppListerTest { 
        mInstalledAppList = Collections.emptyList();

        final InstalledAppListerTestable counter = new InstalledAppListerTestable();

        counter.execute();

        // Wait for the background task to finish.

        ShadowApplication.runBackgroundTasks();

        executorService.runAll();

        ShadowLooper.idleMainLooper();



        assertThat(mInstalledAppList.size()).isEqualTo(3);