From 13ade304819bdd28d61bb040ddd7bded7823891d Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Mon, 27 Nov 2017 12:58:51 -0800 Subject: [PATCH] Switch to modern ArgumentMatchers Test: - adb shell am instrument -w -e class com.android.messaging.ui.attachmentchooser.AttachmentChooserFragmentTest com.android.messaging.test/android.test.InstrumentationTestRunner - adb shell am instrument -w -e class com.android.messaging.ui.conversation.ComposeMessageViewTest com.android.messaging.test/android.test.InstrumentationTestRunner - adb shell am instrument -w -e class com.android.messaging.ui.conversationlist.ConversationListItemViewTest com.android.messaging.test/android.test.InstrumentationTestRunner Change-Id: Ic3f29ed0e13b392d5687934f25d99c2a0e8c4dac --- .../AttachmentChooserFragmentTest.java | 8 +++---- .../conversation/ComposeMessageViewTest.java | 24 +++++++++---------- .../ConversationListItemViewTest.java | 9 ++----- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java b/tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java index 5ec5ab5..e81cd54 100644 --- a/tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java +++ b/tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java @@ -36,10 +36,10 @@ import com.android.messaging.ui.attachmentchooser.AttachmentGridView; import com.android.messaging.ui.attachmentchooser.AttachmentChooserFragment.AttachmentChooserFragmentHost; import com.android.messaging.ui.conversationlist.ConversationListFragment; +import org.mockito.ArgumentMatcher; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.compat.ArgumentMatcher; import java.util.Arrays; import java.util.HashSet; @@ -62,16 +62,14 @@ public class AttachmentChooserFragmentTest extends FragmentTestCase> { + private class IsSetOfGivenAttachments implements ArgumentMatcher> { private final Set mGivenParts; public IsSetOfGivenAttachments(final Set givenParts) { mGivenParts = givenParts; } @Override - public boolean matchesObject(final Object set) { - @SuppressWarnings("unchecked") - final Set actualSet = (Set) set; + public boolean matches(final Set actualSet) { if (actualSet.size() != mGivenParts.size()) { return false; } diff --git a/tests/src/com/android/messaging/ui/conversation/ComposeMessageViewTest.java b/tests/src/com/android/messaging/ui/conversation/ComposeMessageViewTest.java index 8c372f2..2148c71 100644 --- a/tests/src/com/android/messaging/ui/conversation/ComposeMessageViewTest.java +++ b/tests/src/com/android/messaging/ui/conversation/ComposeMessageViewTest.java @@ -16,6 +16,9 @@ package com.android.messaging.ui.conversation; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; + import android.content.Context; import android.media.MediaPlayer; import android.test.suitebuilder.annotation.MediumTest; @@ -39,10 +42,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; @@ -127,8 +130,8 @@ public class ComposeMessageViewTest extends ViewTest { view.requestDraftMessage(false); - Mockito.verify(mockDraftMessageData).loadFromStorage(Matchers.any(BindingBase.class), - Matchers.any(MessageData.class), Mockito.eq(false)); + Mockito.verify(mockDraftMessageData).loadFromStorage(any(BindingBase.class), + isNull(), Mockito.eq(false)); view.onDraftChanged(mockDraftMessageData, DraftMessageData.ALL_CHANGED); @@ -136,12 +139,9 @@ public class ComposeMessageViewTest extends ViewTest { sendButton.performClick(); Mockito.verify(mockIComposeMessageViewHost).sendMessage( - Mockito.argThat(new ArgumentMatcher() { - @Override - public boolean matchesObject(final Object o) { - assertEquals(message.getMessageText(), ((MessageData) o).getMessageText()); - return true; - } + Mockito.argThat(o -> { + assertEquals(message.getMessageText(), o.getMessageText()); + return true; })); } @@ -170,8 +170,8 @@ public class ComposeMessageViewTest extends ViewTest { view.requestDraftMessage(false); - Mockito.verify(mockDraftMessageData).loadFromStorage(Matchers.any(BindingBase.class), - Matchers.any(MessageData.class), Mockito.eq(false)); + Mockito.verify(mockDraftMessageData).loadFromStorage(any(BindingBase.class), + isNull(), Mockito.eq(false)); view.onDraftChanged(mockDraftMessageData, DraftMessageData.ALL_CHANGED); @@ -179,6 +179,6 @@ public class ComposeMessageViewTest extends ViewTest { sendButton.performClick(); Mockito.verify(mockIComposeMessageViewHost).warnOfMissingActionConditions( - Matchers.any(Boolean.class), Matchers.any(Runnable.class)); + any(Boolean.class), any(Runnable.class)); } } diff --git a/tests/src/com/android/messaging/ui/conversationlist/ConversationListItemViewTest.java b/tests/src/com/android/messaging/ui/conversationlist/ConversationListItemViewTest.java index 1fbba1f..afac0d8 100644 --- a/tests/src/com/android/messaging/ui/conversationlist/ConversationListItemViewTest.java +++ b/tests/src/com/android/messaging/ui/conversationlist/ConversationListItemViewTest.java @@ -35,9 +35,9 @@ import com.android.messaging.ui.ViewTest; import com.android.messaging.ui.conversationlist.ConversationListItemView; import com.android.messaging.util.Dates; +import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.compat.ArgumentMatcher; @MediumTest public class ConversationListItemViewTest extends ViewTest { @@ -60,12 +60,7 @@ public class ConversationListItemViewTest extends ViewTest itemDataIdMatcher = - new ArgumentMatcher() { - @Override - public boolean matchesObject(final Object arg) { - return TextUtils.equals(id, ((ConversationListItemData) arg).getConversationId()); - } - }; + arg -> TextUtils.equals(id, arg.getConversationId()); Mockito.verify(mockHost).onConversationClicked( Mockito.argThat(itemDataIdMatcher), Mockito.eq(false), Mockito.eq(conversationView));