Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Change-Id: I252a7e8ae8473f0ce7e177f691aac7dfeb67e7d8
This commit is contained in:
Paul Duffin
2017-03-09 18:49:41 +00:00
parent e98e557469
commit d529415c68
3 changed files with 6 additions and 6 deletions
@@ -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;
@@ -69,7 +69,7 @@ public class AttachmentChooserFragmentTest extends FragmentTestCase<AttachmentCh
}
@Override
public boolean matches(final Object set) {
public boolean matchesObject(final Object set) {
@SuppressWarnings("unchecked")
final Set<MessagePartData> actualSet = (Set<MessagePartData>) set;
if (actualSet.size() != mGivenParts.size()) {