Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e16006c2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "packages/inputmethods/LatinIME: remove deprecated Mockito usages" into... 

Merge "packages/inputmethods/LatinIME: remove deprecated Mockito usages" into main am: 56620738 am: 127336e9

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/3505440



Change-Id: I93827bb838fa41499f6281272caf8efec76ca505
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a4daac0 127336e9

tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.inputmethod.latin; 


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;

tests/src/com/android/inputmethod/latin/network/BlockingHttpClientTests.java

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.inputmethod.latin.network; 
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;

tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.inputmethod.latin.settings; 
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;