Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Mockito 4.6.1 API

Browse Source 
Bug: 236636175
Test: m RunBackupEncryptionRoboTests
Test: m RunBackupEncryptionIntegRoboTests
Test: m RunSettingsRoboTests
Test: m RunSettingsLibRoboTests
Change-Id: I0e301b641312f8cc4a235df5ec62acf1446cbb64
(cherry picked from commit 58ddd21982)
Merged-In: I0e301b641312f8cc4a235df5ec62acf1446cbb64
(cherry picked from commit 86203882dd)
Merged-In: I0e301b641312f8cc4a235df5ec62acf1446cbb64
This commit is contained in:
Sorin Basca
2022-07-05 17:18:29 +01:00
committed by Cherrypicker Worker
parent 4ed2bceece
commit aceee6876a
8 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,8 +22,8 @@ import static com.android.server.backup.encryption.protos.nano.ChunksMetadataPro
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.any;
import static org.mockito.Matchers.eq; import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;

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

@@ -18,9 +18,9 @@ package com.android.server.backup.encryption.tasks;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.testng.Assert.assertThrows; import static org.testng.Assert.assertThrows;

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

@@ -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.assertThat;
import static com.google.common.truth.Truth.assertWithMessage; import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.any;
import static org.mockito.Matchers.eq; import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.testng.Assert.assertFalse; 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.encryption.protos.nano.WrappedKeyProto;
import com.android.server.backup.testing.CryptoTestUtils; 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.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@@ -59,6 +52,14 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; 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) @RunWith(RobolectricTestRunner.class)
public class EncryptedKvBackupTaskTest { public class EncryptedKvBackupTaskTest {
private static final boolean INCREMENTAL = true; private static final boolean INCREMENTAL = true;

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

@@ -21,10 +21,10 @@ import static android.os.UserHandle.MU_ENABLED;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Matchers.any; import static org.mockito.Mockito.any;
import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.anyInt;
import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.anyLong;
import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;

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

@@ -18,7 +18,7 @@ package com.android.settingslib.net;
import static com.google.common.truth.Truth.assertThat; 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.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;

16
packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/EditUserInfoControllerTest.java
View File

@@ -22,7 +22,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.Activity; import android.app.Activity;
@@ -143,7 +143,7 @@ public class EditUserInfoControllerTest {
dialog.show(); dialog.show();
dialog.cancel(); dialog.cancel();
verifyZeroInteractions(successCallback); verifyNoInteractions(successCallback);
verify(cancelCallback, times(1)) verify(cancelCallback, times(1))
.run(); .run();
} }
@@ -159,7 +159,7 @@ public class EditUserInfoControllerTest {
dialog.show(); dialog.show();
dialog.getButton(Dialog.BUTTON_NEGATIVE).performClick(); dialog.getButton(Dialog.BUTTON_NEGATIVE).performClick();
verifyZeroInteractions(successCallback); verifyNoInteractions(successCallback);
verify(cancelCallback, times(1)) verify(cancelCallback, times(1))
.run(); .run();
} }
@@ -180,7 +180,7 @@ public class EditUserInfoControllerTest {
verify(successCallback, times(1)) verify(successCallback, times(1))
.accept("test", oldUserIcon); .accept("test", oldUserIcon);
verifyZeroInteractions(cancelCallback); verifyNoInteractions(cancelCallback);
} }
@Test @Test
@@ -198,7 +198,7 @@ public class EditUserInfoControllerTest {
verify(successCallback, times(1)) verify(successCallback, times(1))
.accept("test", null); .accept("test", null);
verifyZeroInteractions(cancelCallback); verifyNoInteractions(cancelCallback);
} }
@Test @Test
@@ -219,7 +219,7 @@ public class EditUserInfoControllerTest {
verify(successCallback, times(1)) verify(successCallback, times(1))
.accept(expectedNewName, mCurrentIcon); .accept(expectedNewName, mCurrentIcon);
verifyZeroInteractions(cancelCallback); verifyNoInteractions(cancelCallback);
} }
@Test @Test
@@ -238,7 +238,7 @@ public class EditUserInfoControllerTest {
verify(successCallback, times(1)) verify(successCallback, times(1))
.accept("test", newPhoto); .accept("test", newPhoto);
verifyZeroInteractions(cancelCallback); verifyNoInteractions(cancelCallback);
} }
@Test @Test
@@ -257,7 +257,7 @@ public class EditUserInfoControllerTest {
verify(successCallback, times(1)) verify(successCallback, times(1))
.accept("test", newPhoto); .accept("test", newPhoto);
verifyZeroInteractions(cancelCallback); verifyNoInteractions(cancelCallback);
} }
@Test @Test

2
packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/UpdatableListPreferenceDialogFragmentTest.java
View File

@@ -56,7 +56,7 @@ public class UpdatableListPreferenceDialogFragmentTest {
mUpdatableListPrefDlgFragment = spy(UpdatableListPreferenceDialogFragment mUpdatableListPrefDlgFragment = spy(UpdatableListPreferenceDialogFragment
.newInstance(KEY, MetricsProto.MetricsEvent.DIALOG_SWITCH_A2DP_DEVICES)); .newInstance(KEY, MetricsProto.MetricsEvent.DIALOG_SWITCH_A2DP_DEVICES));
mEntries = spy(new ArrayList<>()); mEntries = new ArrayList<>();
mUpdatableListPrefDlgFragment.setEntries(mEntries); mUpdatableListPrefDlgFragment.setEntries(mEntries);
mUpdatableListPrefDlgFragment mUpdatableListPrefDlgFragment
.setMetricsCategory(mUpdatableListPrefDlgFragment.getArguments()); .setMetricsCategory(mUpdatableListPrefDlgFragment.getArguments());

16
services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java
View File

@@ -43,23 +43,23 @@ import static com.android.server.backup.testing.Utils.transferStreamedData;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage; import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.any;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.anyInt;
import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.anyLong;
import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.argThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.intThat;
import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.intThat;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf; import static org.robolectric.Shadows.shadowOf;
import static org.robolectric.shadow.api.Shadow.extract; import static org.robolectric.shadow.api.Shadow.extract;
@@ -2185,7 +2185,7 @@ public class KeyValueBackupTaskTest {
task.waitCancel(); task.waitCancel();
reset(transportMock.transport); reset(transportMock.transport);
taskFinished.block(); taskFinished.block();
verifyZeroInteractions(transportMock.transport); verifyNoInteractions(transportMock.transport);
} }
@Test @Test