diff options
| author | Sorin Basca <sorinbasca@google.com> | 2023-01-11 15:14:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-11 15:14:55 +0000 |
| commit | 166d79de5b1b298c6a980ebec7571d0ca989cc06 (patch) | |
| tree | 6cbc7b6b1cf0369fa0125b1fe5867b2536354731 | |
| parent | 2bd39cf063d3ad549c5efd11c1c5b17bff08eaad (diff) | |
| parent | ecacaefd2fa6888514bea63cabcc156f92346de4 (diff) | |
| download | EmergencyInfo-166d79de5b1b298c6a980ebec7571d0ca989cc06.tar.gz | |
Use Mockito 4.6.1 API am: b81beba238 am: ecacaefd2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/20917550
Change-Id: Iabcfddb26600fa7cd29bd8753e88c8397cb5c973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java | 6 | ||||
| -rw-r--r-- | tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java index b03edbe5..987c13c1 100644 --- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java +++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java @@ -16,11 +16,11 @@ package com.android.emergency.preferences; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +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.when; diff --git a/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java b/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java index 0fde2261..a80d57cd 100644 --- a/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java +++ b/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java @@ -16,10 +16,10 @@ package com.android.emergency.util; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; |