| commit | e16006c2ba5be4a2dbd9c4a5f5a563687dddfb53 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Feb 26 16:55:37 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 26 16:55:37 2025 -0800 |
| tree | 5e080b8ac629ce6945ddb844ad7302736b0db25b | |
| parent | 8a4daac09068b7dfc7b64049379b523e57bd8a15 [diff] | |
| parent | 127336e9f29d69607eab55982324b210279ae8c5 [diff] |
Merge "packages/inputmethods/LatinIME: remove deprecated Mockito usages" into main am: 5662073844 am: 127336e9f2 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/3505440 Change-Id: I93827bb838fa41499f6281272caf8efec76ca505 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java b/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java index 029e1b5..23caa41 100644 --- a/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java +++ b/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java
@@ -18,7 +18,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.validateMockitoUsage; import static org.mockito.Mockito.when;
diff --git a/tests/src/com/android/inputmethod/latin/network/BlockingHttpClientTests.java b/tests/src/com/android/inputmethod/latin/network/BlockingHttpClientTests.java index f6f54eb..d6aaf08 100644 --- a/tests/src/com/android/inputmethod/latin/network/BlockingHttpClientTests.java +++ b/tests/src/com/android/inputmethod/latin/network/BlockingHttpClientTests.java
@@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when;
diff --git a/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java b/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java index 667ffd1..3b55143 100644 --- a/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java +++ b/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import android.app.AlertDialog;