LineageOS/android_packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor code incompatible with Mockito 2.7.13 am: d529415c68

Browse Source 
am: 65a7c6845d

Change-Id: Ic09f2a1f08441c9e44612b2f2a63902f7e12764c
This commit is contained in:
Paul Duffin
2017-03-09 23:59:31 +00:00
committed by android-build-merger
parent 872137e536 65a7c6845d
commit 0188c2ac3e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java
View File

@@ -36,10 +36,10 @@ import com.android.messaging.ui.attachmentchooser.AttachmentGridView;
import com.android.messaging.ui.attachmentchooser.AttachmentChooserFragment.AttachmentChooserFragmentHost; import com.android.messaging.ui.attachmentchooser.AttachmentChooserFragment.AttachmentChooserFragmentHost;
import com.android.messaging.ui.conversationlist.ConversationListFragment; import com.android.messaging.ui.conversationlist.ConversationListFragment;
import org.mockito.ArgumentMatcher;
import org.mockito.Matchers; import org.mockito.Matchers;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.compat.ArgumentMatcher;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
@@ -69,7 +69,7 @@ public class AttachmentChooserFragmentTest extends FragmentTestCase<AttachmentCh
} }
@Override @Override
public boolean matches(final Object set) { public boolean matchesObject(final Object set) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final Set<MessagePartData> actualSet = (Set<MessagePartData>) set; final Set<MessagePartData> actualSet = (Set<MessagePartData>) set;
if (actualSet.size() != mGivenParts.size()) { if (actualSet.size() != mGivenParts.size()) {

4
tests/src/com/android/messaging/ui/conversation/ComposeMessageViewTest.java
View File

@@ -39,10 +39,10 @@ import com.android.messaging.util.BugleGservices;
import com.android.messaging.util.FakeMediaUtil; import com.android.messaging.util.FakeMediaUtil;
import com.android.messaging.util.ImeUtil; import com.android.messaging.util.ImeUtil;
import org.mockito.ArgumentMatcher;
import org.mockito.Matchers; import org.mockito.Matchers;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.compat.ArgumentMatcher;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
@@ -138,7 +138,7 @@ public class ComposeMessageViewTest extends ViewTest<ComposeMessageView> {
Mockito.verify(mockIComposeMessageViewHost).sendMessage( Mockito.verify(mockIComposeMessageViewHost).sendMessage(
Mockito.argThat(new ArgumentMatcher<MessageData>() { Mockito.argThat(new ArgumentMatcher<MessageData>() {
@Override @Override
public boolean matches(final Object o) { public boolean matchesObject(final Object o) {
assertEquals(message.getMessageText(), ((MessageData) o).getMessageText()); assertEquals(message.getMessageText(), ((MessageData) o).getMessageText());
return true; return true;
} }

4
tests/src/com/android/messaging/ui/conversationlist/ConversationListItemViewTest.java
View File

@@ -35,9 +35,9 @@ import com.android.messaging.ui.ViewTest;
import com.android.messaging.ui.conversationlist.ConversationListItemView; import com.android.messaging.ui.conversationlist.ConversationListItemView;
import com.android.messaging.util.Dates; import com.android.messaging.util.Dates;
import org.mockito.ArgumentMatcher;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.compat.ArgumentMatcher;
@MediumTest @MediumTest
public class ConversationListItemViewTest extends ViewTest<ConversationListItemView> { public class ConversationListItemViewTest extends ViewTest<ConversationListItemView> {
@@ -62,7 +62,7 @@ public class ConversationListItemViewTest extends ViewTest<ConversationListItemV
final ArgumentMatcher<ConversationListItemData> itemDataIdMatcher = final ArgumentMatcher<ConversationListItemData> itemDataIdMatcher =
new ArgumentMatcher<ConversationListItemData>() { new ArgumentMatcher<ConversationListItemData>() {
@Override @Override
public boolean matches(final Object arg) { public boolean matchesObject(final Object arg) {
return TextUtils.equals(id, ((ConversationListItemData) arg).getConversationId()); return TextUtils.equals(id, ((ConversationListItemData) arg).getConversationId());
} }
}; };