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

Commit ac6af411 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp

parents de8d037d 61e0bcd1

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

+14 −14
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyObject;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.when;
@@ -39,7 +39,6 @@ import android.os.RemoteException; 
import android.os.UserHandle;

import android.os.UserManager;



import java.util.Collections;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -49,6 +48,7 @@ import org.robolectric.RobolectricTestRunner; 
import org.robolectric.shadows.ShadowApplication;



import java.util.Arrays;

import java.util.Collections;



@RunWith(RobolectricTestRunner.class)

public final class AppWithAdminGrantedPermissionsCounterTest {
@@ -129,7 +129,7 @@ public final class AppWithAdminGrantedPermissionsCounterTest { 
        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));

        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),

                eq(MANAGED_PROFILE_ID));

        verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject());

        verify(mPackageManager, atLeast(0)).getInstallReason(any(), any());

        verifyNoMoreInteractions(mPackageManager);

    }
@@ -166,9 +166,9 @@ public final class AppWithAdminGrantedPermissionsCounterTest { 
    }



    private void configureInstallTimePermissions() throws RemoteException {

        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))

        when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID)))

                .thenReturn(PackageManager.PERMISSION_DENIED);

        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))

        when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID)))

                .thenReturn(PackageManager.PERMISSION_DENIED);

        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))

                .thenReturn(PackageManager.PERMISSION_DENIED);
@@ -178,9 +178,9 @@ public final class AppWithAdminGrantedPermissionsCounterTest { 
                .thenReturn(PackageManager.PERMISSION_DENIED);

        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))

                .thenReturn(PackageManager.PERMISSION_GRANTED);

        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))

        when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID)))

                .thenReturn(PackageManager.PERMISSION_DENIED);

        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))

        when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID)))

                .thenReturn(PackageManager.PERMISSION_DENIED);

    }
@@ -189,15 +189,15 @@ public final class AppWithAdminGrantedPermissionsCounterTest { 
                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);

        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any()))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any()))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any()))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any()))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any()))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);

    }

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

+13 −13
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyObject;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.when;
@@ -122,19 +122,19 @@ public final class AppWithAdminGrantedPermissionsListerTest { 
                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);

        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any()))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any()))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any()))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any()))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);



        // Grant install-time permissions as appropriate.

        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))

        when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID)))

                .thenReturn(PackageManager.PERMISSION_DENIED);

        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))

        when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID)))

                .thenReturn(PackageManager.PERMISSION_DENIED);

        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))

                .thenReturn(PackageManager.PERMISSION_DENIED);
@@ -144,7 +144,7 @@ public final class AppWithAdminGrantedPermissionsListerTest { 
                .thenReturn(PackageManager.PERMISSION_DENIED);

        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))

                .thenReturn(PackageManager.PERMISSION_GRANTED);

        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))

        when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID)))

                .thenReturn(PackageManager.PERMISSION_DENIED);



        // app3 and app5 were installed by enterprise policy.
@@ -168,11 +168,11 @@ public final class AppWithAdminGrantedPermissionsListerTest { 
                buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M)));



        // Grant run-time permissions as appropriate.

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))

        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any()))

                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);



        // Grant install-time permissions as appropriate.

        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))

        when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID)))

                .thenReturn(PackageManager.PERMISSION_DENIED);



        // app6 was not installed by enterprise policy.
@@ -202,7 +202,7 @@ public final class AppWithAdminGrantedPermissionsListerTest { 
        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));

        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),

                eq(MANAGED_PROFILE_ID));

        verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject());

        verify(mPackageManager, atLeast(0)).getInstallReason(any(), any());

        verifyNoMoreInteractions(mPackageManager);

    }

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

+5 −5
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyObject;

import static org.mockito.ArgumentMatchers.argThat;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.argThat;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -170,7 +170,7 @@ public final class InstalledAppListerTest { 
        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));

        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID));

        verify(mPackageManager, atLeast(0))

            .queryIntentActivitiesAsUser(anyObject(), anyInt(), anyInt());

            .queryIntentActivitiesAsUser(any(), anyInt(), anyInt());

    }



    public static boolean checkAppFound(List<UserAppInfo> mInstalledAppList, String appId,

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import static org.mockito.ArgumentMatchers.anyInt; 
import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.verifyNoInteractions;

import static org.mockito.Mockito.when;



import android.Manifest;
@@ -142,6 +142,6 @@ public class DefaultAssistPreferenceControllerTest { 


        controller.getSettingIntent(null);



        verifyZeroInteractions(assistUtils);

        verifyNoInteractions(assistUtils);

    }

}