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

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

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

Merge "Merge "Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: 203f411f" into tm-d1-dev-plus-aosp am: f8868e29" into tm-qpr-dev-plus-aosp
parents cde3bbb2 001a4802

packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/EncryptedBackupTaskTest.java

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import static com.android.server.backup.encryption.protos.nano.ChunksMetadataPro 


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



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/EncryptedFullBackupTaskTest.java

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.server.backup.encryption.tasks; 


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



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.testng.Assert.assertThrows;

packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/EncryptedKvBackupTaskTest.java

+10 −9
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.server.backup.encryption.tasks; 
import static com.google.common.truth.Truth.assertThat;

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



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.testng.Assert.assertFalse;
@@ -41,13 +41,6 @@ import com.android.server.backup.encryption.protos.nano.KeyValueListingProto; 
import com.android.server.backup.encryption.protos.nano.WrappedKeyProto;

import com.android.server.backup.testing.CryptoTestUtils;



import java.io.IOException;

import java.util.Arrays;

import java.util.Map;

import java.util.Map.Entry;



import javax.crypto.SecretKey;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -59,6 +52,14 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;



import java.io.IOException;

import java.util.Arrays;

import java.util.Map;

import java.util.Map.Entry;



import javax.crypto.SecretKey;





@RunWith(RobolectricTestRunner.class)

public class EncryptedKvBackupTaskTest {

    private static final boolean INCREMENTAL = true;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java

+4 −4
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ import static android.os.UserHandle.MU_ENABLED; 
import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Matchers.anyString;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.anyLong;

import static org.mockito.Mockito.anyString;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageUtilsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.settingslib.net; 


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.spy;

import static org.mockito.Mockito.when;