From 869fd2f33ea19643fe53128a67c677769f80d747 Mon Sep 17 00:00:00 2001 From: Karen Lu Date: Thu, 5 Jan 2023 05:14:38 +0000 Subject: [PATCH] Revert "Use Mockito 4.6.1 API" Revert submission 20749672-cherrypick-robo-mockito-4.6.1-4rg619yrrf Reason for revert: Breaking the build on tm-qpr-dev. Bug tracked here: b/264473028 Reverted changes: /q/submissionid:20749672-cherrypick-robo-mockito-4.6.1-4rg619yrrf Change-Id: Ie9d9d944093752f44eff67627e4a35f4df47e6de --- color-check-baseline.xml | 192 ------------------ ...ithAdminGrantedPermissionsCounterTest.java | 28 +-- ...WithAdminGrantedPermissionsListerTest.java | 26 +-- .../applications/InstalledAppListerTest.java | 10 +- ...cialAppAccessPreferenceControllerTest.java | 2 +- ...DefaultAssistPreferenceControllerTest.java | 4 +- .../FingerprintEnrollEnrollingTest.java | 8 +- .../BluetoothDeviceDetailsFragmentTest.java | 2 +- .../DashboardFeatureProviderImplTest.java | 4 +- .../settings/datausage/AppDataUsageTest.java | 10 +- .../datausage/BillingCycleSettingsTest.java | 17 +- .../datausage/lib/DataUsageLibTest.java | 2 +- ...ZoneDetectionPreferenceControllerTest.java | 4 +- ...ModuleVersionPreferenceControllerTest.java | 4 +- ...rmissionsPreferenceControllerTestBase.java | 6 +- ...alledPackagesPreferenceControllerTest.java | 4 +- .../AdvancedPowerUsageDetailTest.java | 8 +- .../fuelgauge/BatteryBackupHelperTest.java | 10 +- ...BatteryHeaderPreferenceControllerTest.java | 6 +- .../fuelgauge/BatteryOptimizeUtilsTest.java | 16 +- ...atteryAppListPreferenceControllerTest.java | 2 +- .../BatteryChartPreferenceControllerTest.java | 4 +- .../batteryusage/BatteryDiffEntryTest.java | 6 +- .../TetherPreferenceControllerTest.java | 7 +- ...utomaticRulesPreferenceControllerTest.java | 17 +- ...ConversationsPreferenceControllerTest.java | 4 +- ...ioritySendersPreferenceControllerTest.java | 4 +- ...arredContactsPreferenceControllerTest.java | 2 +- ...intJobMessagePreferenceControllerTest.java | 10 +- .../PrintJobPreferenceControllerTest.java | 6 +- .../actionbar/SearchMenuControllerTest.java | 8 +- ...ghlightablePreferenceGroupAdapterTest.java | 8 +- .../NetworkRequestDialogFragmentTest.java | 2 +- .../DisclaimerItemListAdapterTest.java | 8 +- ...EmergencyCallLimitationDisclaimerTest.java | 4 +- .../calling/LocationPolicyDisclaimerTest.java | 4 +- .../WifiCallingDisclaimerFragmentTest.java | 9 +- .../WifiCallingSettingsForSubTest.java | 11 +- .../WifiDetailPreferenceController2Test.java | 12 +- 39 files changed, 146 insertions(+), 345 deletions(-) diff --git a/color-check-baseline.xml b/color-check-baseline.xml index 6f0ff094e4b..b4915b937bd 100644 --- a/color-check-baseline.xml +++ b/color-check-baseline.xml @@ -525,86 +525,6 @@ column="5"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index 71c532c7e2f..4e08f9841df 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java @@ -20,10 +20,10 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; 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,6 +39,7 @@ 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; @@ -48,7 +49,6 @@ 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(any(), any()); + verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject()); verifyNoMoreInteractions(mPackageManager); } @@ -166,9 +166,9 @@ public final class AppWithAdminGrantedPermissionsCounterTest { } private void configureInstallTimePermissions() throws RemoteException { - when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID))) + when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID))) + when(mPackageManagerService.checkUidPermission(anyObject(), 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(any(), eq(APP_5_UID))) + when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID))) + when(mPackageManagerService.checkUidPermission(anyObject(), 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), any())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); } diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index 9a4978b9d6e..a8186373d38 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java @@ -20,10 +20,10 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; 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), any())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); // Grant install-time permissions as appropriate. - when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID))) + when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID))) + when(mPackageManagerService.checkUidPermission(anyObject(), 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(any(), eq(APP_5_UID))) + when(mPackageManagerService.checkUidPermission(anyObject(), 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), any())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); // Grant install-time permissions as appropriate. - when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID))) + when(mPackageManagerService.checkUidPermission(anyObject(), 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(any(), any()); + verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject()); verifyNoMoreInteractions(mPackageManager); } diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index 602d678c9d8..e2aed368f80 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -20,11 +20,11 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.argThat; +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.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(any(), anyInt(), anyInt()); + .queryIntentActivitiesAsUser(anyObject(), anyInt(), anyInt()); } public static boolean checkAppFound(List mInstalledAppList, String appId, diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index da5ada783ad..e0a08364a8c 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.anyInt; +import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java index 178a26f8453..3e46027c362 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -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.verifyNoInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.Manifest; @@ -142,6 +142,6 @@ public class DefaultAssistPreferenceControllerTest { controller.getSettingIntent(null); - verifyNoInteractions(assistUtils); + verifyZeroInteractions(assistUtils); } } diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index ee6ae223169..b8992068a8e 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -25,11 +25,11 @@ import static com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrol import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index 81f485986b9..fac8b584f0a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -21,8 +21,8 @@ import static android.bluetooth.BluetoothDevice.BOND_NONE; 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.doReturn; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 37b8ab630fb..f2b0acddbed 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.content.Context; @@ -268,7 +268,7 @@ public class DashboardFeatureProviderImplTest { mImpl.bindPreferenceToTileAndGetObservers(mActivity, mFragment, mForceRoundedIcon, null /* keys */, tile, "123", Preference.DEFAULT_ORDER); - verifyNoInteractions(tile); + verifyZeroInteractions(tile); } @Test diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index e7b59a35fe5..bccec3ed8b0 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -19,14 +19,14 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyBoolean; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index cef5928c717..861b4e395fa 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -19,15 +19,16 @@ import static android.net.NetworkPolicy.CYCLE_NONE; import static com.google.common.truth.Truth.assertThat; -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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.nullable; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -132,9 +133,9 @@ public class BillingCycleSettingsTest { mDataLimit, mDataWarning, mEnableDataLimit, mEnableDataWarning); doReturn("some-string").when(billingCycleSettings).getString(anyInt(), anyInt()); - when(mNetworkPolicyEditor.getPolicyCycleDay(any())).thenReturn(CYCLE_NONE + 1); - when(mNetworkPolicyEditor.getPolicyLimitBytes(any())).thenReturn(2000L); - when(mNetworkPolicyEditor.getPolicyWarningBytes(any())).thenReturn(1000L); + when(mNetworkPolicyEditor.getPolicyCycleDay(anyObject())).thenReturn(CYCLE_NONE + 1); + when(mNetworkPolicyEditor.getPolicyLimitBytes(anyObject())).thenReturn(2000L); + when(mNetworkPolicyEditor.getPolicyWarningBytes(anyObject())).thenReturn(1000L); billingCycleSettings.updatePrefs(); diff --git a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java index 4391425d2ba..70a1a38fa0e 100644 --- a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java +++ b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java @@ -18,7 +18,7 @@ package com.android.settings.datausage.lib; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.anyInt; +import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java index 9fb364ed62e..b9c4edc9af2 100644 --- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.app.time.Capabilities; @@ -99,7 +99,7 @@ public class LocationTimeZoneDetectionPreferenceControllerTest { mController.setChecked(true); // Verify the TimeManager was not called. - verifyNoInteractions(mTimeManager); + verifyZeroInteractions(mTimeManager); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java index 35e044cc2f3..3f49b15b634 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static com.android.settings.deviceinfo.firmwareversion.MainlineModuleVers import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.eq; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index 06e41073716..09d1c84f994 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -18,10 +18,10 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -79,7 +79,7 @@ public abstract class AdminGrantedPermissionsPreferenceControllerTestBase { } }).when(mFeatureFactory.applicationFeatureProvider) .calculateNumberOfAppsWithAdminGrantedPermissions(eq(mPermissions), - eq(async), any()); + eq(async), anyObject()); } @Test diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index c32d2d79256..f39b4b8821b 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyObject; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; @@ -74,7 +74,7 @@ public class EnterpriseInstalledPackagesPreferenceControllerTest { return null; } }).when(mFeatureFactory.applicationFeatureProvider) - .calculateNumberOfPolicyInstalledApps(eq(async), any()); + .calculateNumberOfPolicyInstalledApps(eq(async), anyObject()); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index 8c650868836..90e8caf85a2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.app.AppOpsManager; @@ -859,7 +859,7 @@ public class AdvancedPowerUsageDetailTest { mFragment.onRadioButtonClicked(mOptimizePreference); mFragment.onPause(); - verifyNoInteractions(mMetricsFeatureProvider); + verifyZeroInteractions(mMetricsFeatureProvider); } @Test @@ -870,7 +870,7 @@ public class AdvancedPowerUsageDetailTest { mFragment.notifyBackupManager(); - verifyNoInteractions(mBackupManager); + verifyZeroInteractions(mBackupManager); } @Test @@ -893,6 +893,6 @@ public class AdvancedPowerUsageDetailTest { mFragment.onPause(); - verifyNoInteractions(mBackupManager); + verifyZeroInteractions(mBackupManager); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java index 55ff93b964a..283df7bcc43 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import android.app.AppOpsManager; import android.app.backup.BackupDataInputStream; @@ -254,7 +254,7 @@ public final class BatteryBackupHelperTest { mBatteryBackupHelper.restoreEntity(mBackupDataInputStream); - verifyNoInteractions(mBackupDataInputStream); + verifyZeroInteractions(mBackupDataInputStream); } @Test @@ -292,13 +292,13 @@ public final class BatteryBackupHelperTest { @Test public void restoreOptimizationMode_nullBytesData_skipRestore() throws Exception { mBatteryBackupHelper.restoreOptimizationMode(new byte[0]); - verifyNoInteractions(mBatteryOptimizeUtils); + verifyZeroInteractions(mBatteryOptimizeUtils); mBatteryBackupHelper.restoreOptimizationMode("invalid data format".getBytes()); - verifyNoInteractions(mBatteryOptimizeUtils); + verifyZeroInteractions(mBatteryOptimizeUtils); mBatteryBackupHelper.restoreOptimizationMode(DELIMITER.getBytes()); - verifyNoInteractions(mBatteryOptimizeUtils); + verifyZeroInteractions(mBatteryOptimizeUtils); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 78534e138f0..6389dc95fe1 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.app.Activity; @@ -267,7 +267,7 @@ public class BatteryHeaderPreferenceControllerTest { mController.updateHeaderByBatteryTips(null, mBatteryInfo); - verifyNoInteractions(mBatteryUsageProgressBarPref); + verifyZeroInteractions(mBatteryUsageProgressBarPref); } @Test @@ -277,7 +277,7 @@ public class BatteryHeaderPreferenceControllerTest { mController.updateHeaderByBatteryTips(lowBatteryTip, null); - verifyNoInteractions(mBatteryUsageProgressBarPref); + verifyZeroInteractions(mBatteryUsageProgressBarPref); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java index f92c3223b90..b223d0bc755 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java @@ -25,16 +25,16 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.anyLong; -import static org.mockito.Mockito.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.app.AppOpsManager; @@ -183,8 +183,8 @@ public class BatteryOptimizeUtilsTest { mBatteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED); TimeUnit.SECONDS.sleep(1); - verifyNoInteractions(mMockBackend); - verifyNoInteractions(mMockBatteryUtils); + verifyZeroInteractions(mMockBackend); + verifyZeroInteractions(mMockBatteryUtils); } @Test @@ -247,7 +247,7 @@ public class BatteryOptimizeUtilsTest { AppOpsManager.MODE_ALLOWED, /* allowListed */ false, /* isSystemOrDefaultApp */ false); - verifyNoInteractions(mMockBatteryUtils); + verifyZeroInteractions(mMockBatteryUtils); final InOrder inOrder = inOrder(mMockBackend); inOrder.verify(mMockBackend).refreshList(); @@ -261,7 +261,7 @@ public class BatteryOptimizeUtilsTest { AppOpsManager.MODE_ALLOWED, /* allowListed */ true, /* isSystemOrDefaultApp */ true); - verifyNoInteractions(mMockBatteryUtils); + verifyZeroInteractions(mMockBatteryUtils); final InOrder inOrder = inOrder(mMockBackend); inOrder.verify(mMockBackend).refreshList(); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java index 5815bae6b6e..da397fd791e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge.batteryusage; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.anyInt; +import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java index 151b8ae3166..9fbcb1688db 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.fuelgauge.batteryusage; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyFloat; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyFloat; -import static org.mockito.Mockito.anyLong; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java index 07a5504f61d..683f0fd2df4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java @@ -17,10 +17,10 @@ package com.android.settings.fuelgauge.batteryusage; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.spy; import android.content.ContentValues; diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index 9aa79ff4db6..bafc021d9b2 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -16,15 +16,16 @@ package com.android.settings.network; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; +import android.app.admin.DevicePolicyManager; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothPan; import android.bluetooth.BluetoothProfile; @@ -161,7 +162,7 @@ public class TetherPreferenceControllerTest { mController.onResume(); - verifyNoInteractions(mPreference); + verifyZeroInteractions(mPreference); Settings.Global.putInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java index 3791c23193e..1660955e323 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -18,7 +18,6 @@ package com.android.settings.notification.zen; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -43,10 +42,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.mockito.internal.util.reflection.FieldSetter; import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; @@ -193,26 +192,16 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { rule.setEnabled(false); rMap.put(testId, rule); mockGetAutomaticZenRules(NUM_RULES, rMap); - setZenRulePreferenceField("mId", testId); + FieldSetter.setField(mZenRulePreference, ZenRulePreference.class.getDeclaredField("mId"), testId); mController.updateState(mockPref); verify(mZenRulePreference, times(1)).updatePreference(any()); verify(mockPref, never()).removeAll(); assertEquals(NUM_RULES, mController.mZenRulePreferences.size()); } - private void setZenRulePreferenceField(String name, Object value) { - try { - Field field = ZenRulePreference.class.getDeclaredField("mId"); - field.setAccessible(true); - field.set(mZenRulePreference, value); - } catch (ReflectiveOperationException e) { - fail("Unable to set mZenRulePreference field: " + name); - } - } - private void mockGetAutomaticZenRules(int numRules, Map rules) { Map.Entry[] arr = new Map.Entry[numRules]; rules.entrySet().toArray(arr); when(mBackend.getAutomaticZenRules()).thenReturn(arr); } -} +} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java index d5834f932c3..6bf0538c33b 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java @@ -26,7 +26,7 @@ import static com.android.settings.notification.zen.ZenModePriorityConversations import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; @@ -146,4 +146,4 @@ public class ZenModePriorityConversationsPreferenceControllerTest { } return null; } -} +} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java index c431c5332ab..99fa8e6cdd4 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java @@ -30,8 +30,8 @@ import static com.android.settings.notification.zen.ZenPrioritySendersHelper.KEY import static com.android.settings.notification.zen.ZenPrioritySendersHelper.KEY_NONE; import static com.android.settings.notification.zen.ZenPrioritySendersHelper.UNKNOWN; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java index 01f3dfabcb3..2f7dfe7f9b8 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.notification.zen; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java index b5d07cc5231..96036d52755 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -72,7 +72,7 @@ public class PrintJobMessagePreferenceControllerTest { mPreference = new Preference(mContext); when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager); when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager); - when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob); + when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob); when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo); mController = new PrintJobMessagePreferenceController(mContext, PREF_KEY); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); @@ -93,7 +93,7 @@ public class PrintJobMessagePreferenceControllerTest { @Test public void updateUi_visiblePreference() { - when(mPrintJobInfo.getStatus(any())).thenReturn("TestPrint"); + when(mPrintJobInfo.getStatus(anyObject())).thenReturn("TestPrint"); mLifecycle.handleLifecycleEvent(ON_START); assertThat(mPreference.isVisible()).isTrue(); @@ -103,7 +103,7 @@ public class PrintJobMessagePreferenceControllerTest { @Test public void updateUi_invisiblePreference() { - when(mPrintJobInfo.getStatus(any())).thenReturn(null); + when(mPrintJobInfo.getStatus(anyObject())).thenReturn(null); mLifecycle.handleLifecycleEvent(ON_START); assertThat(mPreference.isVisible()).isFalse(); diff --git a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java index da4d58c757b..09c5bf368af 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -75,7 +75,7 @@ public class PrintJobPreferenceControllerTest { mTestLabel = "PrintTest"; when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager); when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager); - when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob); + when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob); when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo); mController = new PrintJobPreferenceController(mContext, PREF_KEY); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java index 2a7bd29a964..c646a935192 100644 --- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.search.actionbar.SearchMenuController.MENU_SE import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; @@ -91,7 +91,7 @@ public class SearchMenuControllerTest { SearchMenuController.init(mHost); mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyNoInteractions(mMenu); + verifyZeroInteractions(mMenu); } @Test @@ -100,7 +100,7 @@ public class SearchMenuControllerTest { SearchMenuController.init(mHost); mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyNoInteractions(mMenu); + verifyZeroInteractions(mMenu); } @Test @@ -112,6 +112,6 @@ public class SearchMenuControllerTest { mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyNoInteractions(mMenu); + verifyZeroInteractions(mMenu); } } diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index e297b788af9..62c7bd8091c 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.content.Context; @@ -111,7 +111,7 @@ public class HighlightablePreferenceGroupAdapterTest { ReflectionHelpers.setField(mAdapter, "mHighlightRequested", false); mAdapter.requestHighlight(mRoot, null /* recyclerView */, mock(AppBarLayout.class)); - verifyNoInteractions(mRoot); + verifyZeroInteractions(mRoot); } @Test @@ -125,7 +125,7 @@ public class HighlightablePreferenceGroupAdapterTest { when(mFragment.getArguments()).thenReturn(null); when(mFragment.getPreferenceScreen()).thenReturn(screen); HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment); - verifyNoInteractions(screen); + verifyZeroInteractions(screen); } @Test @@ -150,7 +150,7 @@ public class HighlightablePreferenceGroupAdapterTest { HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment); verify(mFragment).getInitialExpandedChildCount(); - verifyNoInteractions(screen); + verifyZeroInteractions(screen); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java index e5b13c4b114..e4d39828c7f 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java @@ -195,7 +195,7 @@ public class NetworkRequestDialogFragmentTest { } private List createWifiEntryList() { - List wifiEntryList = new ArrayList<>(); + List wifiEntryList = spy(new ArrayList<>()); final WifiEntry wifiEntry1 = mock(WifiEntry.class); when(wifiEntry1.getSsid()).thenReturn("Test AP 1"); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java index 610e520e49b..8478a5471ac 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java @@ -21,9 +21,9 @@ import static com.android.settings.wifi.calling.DisclaimerItemListAdapter import static com.android.settings.wifi.calling.DisclaimerItemListAdapter .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyBoolean; -import static org.mockito.Mockito.anyInt; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -75,7 +75,7 @@ public class DisclaimerItemListAdapterTest { mDisclaimerItem = spy(new MockDisclaimerItem(mContext, 0 /* subId */)); mDisclaimerItemList.add(mDisclaimerItem); - when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView); + when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView); when(mViewGroup.getContext()).thenReturn(mContext); when(mViewGroup.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).thenReturn( mLayoutInflater); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java index c8e4cce6d0a..985edda69b5 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.anyString; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java index 148095aac02..3fe9678c26e 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.anyString; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java index 0ece537371f..207a2318c61 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java @@ -16,9 +16,10 @@ package com.android.settings.wifi.calling; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyBoolean; -import static org.mockito.Mockito.anyInt; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -94,7 +95,7 @@ public class WifiCallingDisclaimerFragmentTest { doReturn(mActivity).when(mFragment).getActivity(); - when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView); + when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView); when(mView.findViewById(R.id.agree_button)).thenReturn(mAgreeButton); when(mView.findViewById(R.id.disagree_button)).thenReturn(mDisagreeButton); when(mView.findViewById(R.id.disclaimer_item_list)).thenReturn(mRecyclerView); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java index 1faa611b970..e2c5ca33b4c 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java @@ -16,17 +16,17 @@ package com.android.settings.wifi.calling; +import static junit.framework.Assert.assertEquals; + import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; - -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -44,6 +44,7 @@ import android.telephony.CarrierConfigManager; import android.telephony.TelephonyManager; import android.telephony.ims.ImsMmTelManager; import android.view.View; +import android.widget.TextView; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java index c86a0230351..274ac16fbfc 100644 --- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java @@ -17,16 +17,15 @@ package com.android.settings.wifi.details2; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyBoolean; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.nullable; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -94,6 +93,7 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.InOrder; +import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; @@ -1255,7 +1255,7 @@ public class WifiDetailPreferenceController2Test { mMockWifiConfig.creatorUid = doUid; ComponentName doComponent = new ComponentName(doPackage, "some.Class"); try { - when(mMockPackageManager.getPackageUidAsUser(anyString(), anyInt())) + when(mMockPackageManager.getPackageUidAsUser(Matchers.anyString(), Matchers.anyInt())) .thenReturn(doUid); } catch (PackageManager.NameNotFoundException e) { //do nothing