filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to modern ArgumentMatchers

Browse Source 
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
This commit is contained in:
Philip P. Moltmann
2017-12-12 13:07:12 -08:00
parent 2e86be170a
commit ea5d77fa38
3 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java
+3 -5
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.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<AttachmentCh
/** A custom argument matcher that checks whether the set argument passed in is a set
* with identical attachment data as the given set.
*/
private class IsSetOfGivenAttachments extends ArgumentMatcher<Set<MessagePartData>> {
private class IsSetOfGivenAttachments implements ArgumentMatcher<Set<MessagePartData>> {
private final Set<MessagePartData> mGivenParts;
public IsSetOfGivenAttachments(final Set<MessagePartData> givenParts) {
mGivenParts = givenParts;
}
@Override
public boolean matchesObject(final Object set) {
@SuppressWarnings("unchecked")
final Set<MessagePartData> actualSet = (Set<MessagePartData>) set;
public boolean matches(final Set<MessagePartData> actualSet) {
if (actualSet.size() != mGivenParts.size()) {
return false;
}