From d85d04d98ad3f819da874892cfc68b8b267d04ce Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Tue, 25 Feb 2025 15:37:46 +0100 Subject: [PATCH] packages/apps/Settings: remove deprecated Mockito usages Test: m checkbuild Flag: TEST_ONLY Bug: 310268946 Change-Id: Ibfe27bc2399bf1f06d6b790f9fe68d31da60e43a --- .../settings/display/ThemePreferenceControllerTest.java | 8 ++++---- .../deviceinfo/storage/StorageAsyncLoaderTest.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/legacy_unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/legacy_unit/src/com/android/settings/display/ThemePreferenceControllerTest.java index c5ee0000a05..45c7f7e58be 100644 --- a/tests/legacy_unit/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/legacy_unit/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -18,10 +18,10 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java index 9679275b77e..5c36c4339af 100644 --- a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java @@ -18,10 +18,10 @@ package com.android.settings.deviceinfo.storage; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy;