diff options
| author | Karen Lu <kxylu@google.com> | 2023-01-05 05:22:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-01-05 05:22:28 +0000 |
| commit | 2bd39cf063d3ad549c5efd11c1c5b17bff08eaad (patch) | |
| tree | 68b031027ca3c06bfd675b3eb5bb6c11ca281ec3 | |
| parent | 8f9f670e9b20a384b7e8f2ea5d740c878f77b342 (diff) | |
| parent | 37909475cb58675f30f01851a91e1c5d54d2578a (diff) | |
| download | EmergencyInfo-2bd39cf063d3ad549c5efd11c1c5b17bff08eaad.tar.gz | |
Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev
| -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 987c13c1..b03edbe5 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.Mockito.any; -import static org.mockito.Mockito.anyString; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyString; +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.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 a80d57cd..0fde2261 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; |