summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2022-07-05 18:14:59 +0100
committerKevin Liu <congxiliu@google.com>2022-12-16 20:16:39 +0000
commit027abd14dd8155716a8fcb53f6aabf32b953d506 (patch)
tree2680f6b4fc4178b9af67a8c8c33380c8364c28ee
parent218d654fc41f3981b8795583a930b29fcd9f567e (diff)
downloadEmergencyInfo-027abd14dd8155716a8fcb53f6aabf32b953d506.tar.gz
Use Mockito 4.6.1 API
Bug: 236636175 Test: m RunEmergencyInfoRoboTests Change-Id: I756c8d8356e40a8048a59f84a135001166fccb55 Merged-In: I756c8d8356e40a8048a59f84a135001166fccb55
-rw-r--r--tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java6
-rw-r--r--tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java2
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;