Refactor code incompatible with Mockito 2.7.13
Bug: 32912773 Test: make checkbuild Change-Id: I252a7e8ae8473f0ce7e177f691aac7dfeb67e7d8
This commit is contained in:
@@ -39,10 +39,10 @@ import com.android.messaging.util.BugleGservices;
|
||||
import com.android.messaging.util.FakeMediaUtil;
|
||||
import com.android.messaging.util.ImeUtil;
|
||||
|
||||
import org.mockito.ArgumentMatcher;
|
||||
import org.mockito.Matchers;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.compat.ArgumentMatcher;
|
||||
import org.mockito.invocation.InvocationOnMock;
|
||||
import org.mockito.stubbing.Answer;
|
||||
|
||||
@@ -138,7 +138,7 @@ public class ComposeMessageViewTest extends ViewTest<ComposeMessageView> {
|
||||
Mockito.verify(mockIComposeMessageViewHost).sendMessage(
|
||||
Mockito.argThat(new ArgumentMatcher<MessageData>() {
|
||||
@Override
|
||||
public boolean matches(final Object o) {
|
||||
public boolean matchesObject(final Object o) {
|
||||
assertEquals(message.getMessageText(), ((MessageData) o).getMessageText());
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user