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

Commit baadb88b authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "frameworks/base: remove usages of deprecated Mockito matchers" into main

parents c74a0961 dbc5e635
Loading
Loading
Loading
Loading
+13 −13
Original line number Diff line number Diff line
@@ -98,9 +98,9 @@ public class UserDataPreparerTest {
        File systemDeDir = mUserDataPreparer.getDataSystemDeDirectory(TEST_USER_ID);
        systemDeDir.mkdirs();
        mUserDataPreparer.prepareUserData(TEST_USER, StorageManager.FLAG_STORAGE_DE);
        verify(mStorageManagerMock).prepareUserStorage(isNull(String.class), eq(TEST_USER_ID),
        verify(mStorageManagerMock).prepareUserStorage(isNull(), eq(TEST_USER_ID),
                eq(StorageManager.FLAG_STORAGE_DE));
        verify(mInstaller).createUserData(isNull(String.class), eq(TEST_USER_ID),
        verify(mInstaller).createUserData(isNull(), eq(TEST_USER_ID),
                eq(TEST_USER_SERIAL), eq(StorageManager.FLAG_STORAGE_DE));
        int serialNumber = UserDataPreparer.getSerialNumber(userDeDir);
        assertEquals(TEST_USER_SERIAL, serialNumber);
@@ -115,9 +115,9 @@ public class UserDataPreparerTest {
        File systemCeDir = mUserDataPreparer.getDataSystemCeDirectory(TEST_USER_ID);
        systemCeDir.mkdirs();
        mUserDataPreparer.prepareUserData(TEST_USER, StorageManager.FLAG_STORAGE_CE);
        verify(mStorageManagerMock).prepareUserStorage(isNull(String.class), eq(TEST_USER_ID),
        verify(mStorageManagerMock).prepareUserStorage(isNull(), eq(TEST_USER_ID),
                eq(StorageManager.FLAG_STORAGE_CE));
        verify(mInstaller).createUserData(isNull(String.class), eq(TEST_USER_ID),
        verify(mInstaller).createUserData(isNull(), eq(TEST_USER_ID),
                eq(TEST_USER_SERIAL), eq(StorageManager.FLAG_STORAGE_CE));
        int serialNumber = UserDataPreparer.getSerialNumber(userCeDir);
        assertEquals(TEST_USER_SERIAL, serialNumber);
@@ -129,10 +129,10 @@ public class UserDataPreparerTest {
    public void testPrepareUserData_forNewUser_destroysOnFailure() throws Exception {
        TEST_USER.lastLoggedInTime = 0;
        doThrow(new IllegalStateException("expected exception for test")).when(mStorageManagerMock)
                .prepareUserStorage(isNull(String.class), eq(TEST_USER_ID),
                .prepareUserStorage(isNull(), eq(TEST_USER_ID),
                        eq(StorageManager.FLAG_STORAGE_CE));
        mUserDataPreparer.prepareUserData(TEST_USER, StorageManager.FLAG_STORAGE_CE);
        verify(mStorageManagerMock).destroyUserStorage(isNull(String.class), eq(TEST_USER_ID),
        verify(mStorageManagerMock).destroyUserStorage(isNull(), eq(TEST_USER_ID),
                eq(StorageManager.FLAG_STORAGE_CE));
    }

@@ -140,10 +140,10 @@ public class UserDataPreparerTest {
    public void testPrepareUserData_forExistingUser_doesNotDestroyOnFailure() throws Exception {
        TEST_USER.lastLoggedInTime = System.currentTimeMillis();
        doThrow(new IllegalStateException("expected exception for test")).when(mStorageManagerMock)
                .prepareUserStorage(isNull(String.class), eq(TEST_USER_ID),
                .prepareUserStorage(isNull(), eq(TEST_USER_ID),
                        eq(StorageManager.FLAG_STORAGE_CE));
        mUserDataPreparer.prepareUserData(TEST_USER, StorageManager.FLAG_STORAGE_CE);
        verify(mStorageManagerMock, never()).destroyUserStorage(isNull(String.class),
        verify(mStorageManagerMock, never()).destroyUserStorage(isNull(),
                eq(TEST_USER_ID), eq(StorageManager.FLAG_STORAGE_CE));
    }

@@ -171,9 +171,9 @@ public class UserDataPreparerTest {

        mUserDataPreparer.destroyUserData(TEST_USER_ID, StorageManager.FLAG_STORAGE_DE);

        verify(mInstaller).destroyUserData(isNull(String.class), eq(TEST_USER_ID),
        verify(mInstaller).destroyUserData(isNull(), eq(TEST_USER_ID),
                        eq(StorageManager.FLAG_STORAGE_DE));
        verify(mStorageManagerMock).destroyUserStorage(isNull(String.class), eq(TEST_USER_ID),
        verify(mStorageManagerMock).destroyUserStorage(isNull(), eq(TEST_USER_ID),
                        eq(StorageManager.FLAG_STORAGE_DE));

        // systemDir (normal path: /data/system/users/$userId) should have been deleted.
@@ -195,9 +195,9 @@ public class UserDataPreparerTest {

        mUserDataPreparer.destroyUserData(TEST_USER_ID, StorageManager.FLAG_STORAGE_CE);

        verify(mInstaller).destroyUserData(isNull(String.class), eq(TEST_USER_ID),
        verify(mInstaller).destroyUserData(isNull(), eq(TEST_USER_ID),
                eq(StorageManager.FLAG_STORAGE_CE));
        verify(mStorageManagerMock).destroyUserStorage(isNull(String.class), eq(TEST_USER_ID),
        verify(mStorageManagerMock).destroyUserStorage(isNull(), eq(TEST_USER_ID),
                eq(StorageManager.FLAG_STORAGE_CE));

        // systemCeDir (normal path: /data/system_ce/$userId) should still exist but be empty, since
@@ -225,7 +225,7 @@ public class UserDataPreparerTest {
                .reconcileUsers(StorageManager.UUID_PRIVATE_INTERNAL, Arrays.asList(u1, u2),
                        Arrays.asList(dir1, dir2, dir3));
        // Verify that user 3 data is removed
        verify(mInstaller).destroyUserData(isNull(String.class), eq(3),
        verify(mInstaller).destroyUserData(isNull(), eq(3),
                eq(StorageManager.FLAG_STORAGE_DE|StorageManager.FLAG_STORAGE_CE));
    }

+6 −6
Original line number Diff line number Diff line
@@ -816,14 +816,14 @@ public class DevicePolicyManagerTest extends DpmTestBase {
                MockUtils.checkIntentAction(
                        DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLED),
                MockUtils.checkUserHandle(CALLER_USER_HANDLE),
                isNull(String.class),
                isNull(),
                eq(AppOpsManager.OP_NONE),
                any(Bundle.class),
                any(BroadcastReceiver.class),
                eq(dpms.mHandler),
                eq(Activity.RESULT_OK),
                isNull(String.class),
                isNull(Bundle.class));
                isNull(),
                isNull());

        assertThat(dpm.isAdminActiveAsUser(admin1, CALLER_USER_HANDLE)).isFalse();
        verify(getServices().usageStatsManagerInternal).setActiveAdminApps(
@@ -873,14 +873,14 @@ public class DevicePolicyManagerTest extends DpmTestBase {
                MockUtils.checkIntentAction(
                        DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLED),
                MockUtils.checkUserHandle(CALLER_USER_HANDLE),
                isNull(String.class),
                isNull(),
                eq(AppOpsManager.OP_NONE),
                any(Bundle.class),
                any(BroadcastReceiver.class),
                eq(dpms.mHandler),
                eq(Activity.RESULT_OK),
                isNull(String.class),
                isNull(Bundle.class));
                isNull(),
                isNull());

        assertThat(dpm.isAdminActiveAsUser(admin1, CALLER_USER_HANDLE)).isFalse();
        verify(getServices().usageStatsManagerInternal).setActiveAdminApps(
+6 −6
Original line number Diff line number Diff line
@@ -306,9 +306,9 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest {

        // This method is always called, even with PI == null.
        if (resultIntent == null) {
            verify(mServiceContext, times(1)).sendIntentSender(isNull(IntentSender.class));
            verify(mServiceContext, times(1)).sendIntentSender(isNull());
        } else {
            verify(mServiceContext, times(1)).sendIntentSender(notNull(IntentSender.class));
            verify(mServiceContext, times(1)).sendIntentSender(notNull());
        }

        runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> {
@@ -619,7 +619,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest {
                    makeResultIntent()));

            // The intent should be sent right away.
            verify(mServiceContext, times(1)).sendIntentSender(notNull(IntentSender.class));
            verify(mServiceContext, times(1)).sendIntentSender(notNull());
        });

        // Already pinned.
@@ -661,7 +661,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest {
            assertTrue(request.accept());

            // The intent is only sent once, so times(1).
            verify(mServiceContext, times(1)).sendIntentSender(isNull(IntentSender.class));
            verify(mServiceContext, times(1)).sendIntentSender(isNull());
        });

        // Still pinned.
@@ -698,7 +698,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest {
                    makeResultIntent()));

            // The intent should be sent right away.
            verify(mServiceContext, times(1)).sendIntentSender(notNull(IntentSender.class));
            verify(mServiceContext, times(1)).sendIntentSender(notNull());
        });

        // Already pinned.
@@ -742,7 +742,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest {
            assertTrue(request.accept());

            // The intent is only sent once, so times(1).
            verify(mServiceContext, times(1)).sendIntentSender(isNull(IntentSender.class));
            verify(mServiceContext, times(1)).sendIntentSender(isNull());
        });

        // Still pinned.
+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class DiskStatsLoggingServiceTest extends AndroidTestCase {
        mDownloads = new TemporaryFolder();
        mDownloads.create();
        mStorageStats = new ExternalStorageStats();
        when(mSsm.queryExternalStatsForUser(isNull(String.class), any(UserHandle.class)))
        when(mSsm.queryExternalStatsForUser((String)isNull(), any(UserHandle.class)))
                .thenReturn(mStorageStats);
        when(mJobService.getSystemService(anyString())).thenReturn(mSsm);
    }
+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ public class SmsApplicationTest {
                .replacePreferredActivity(intentFilterCaptor.capture(),
                        eq(IntentFilter.MATCH_CATEGORY_SCHEME
                                | IntentFilter.MATCH_ADJUSTMENT_NORMAL),
                        isNotNull(List.class),
                        (List<ComponentName>)isNotNull(),
                        eq(new ComponentName(TEST_COMPONENT_NAME.getPackageName(), SEND_TO_NAME)));

        Set<String> capturedSchemes = intentFilterCaptor.getAllValues().stream()