chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java - Issue 2076783004: Changes to update Junit and Mockito.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java

Issue 2076783004: Changes to update Junit and Mockito. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes to update Junit and Mockito. Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java ('k') | chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/JSONTestUtils.java » ('j') | third_party/junit/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java

index 529f8d34b40af4439e2ad844a4cd7c0eb253f707..a34870b82ef92073269f28fecfdb7d6c7bb37b1d 100644

--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java

+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java

@@ -5,16 +5,15 @@

package org.chromium.chrome.browser.media.router.cast;

import static org.junit.Assert.assertNotNull;

-import static org.mockito.Matchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doReturn;

+import static org.mockito.Mockito.isNull;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

-import android.support.v7.media.MediaRouteSelector;

import android.support.v7.media.MediaRouter;

import org.chromium.base.test.util.Feature;

@@ -162,7 +161,7 @@ public class DiscoveryCallbackTest extends ChromeMediaRouterTestBase {

MediaRouter.RouteInfo info = createMockRouteInfo(SINK_ID1, SINK_NAME1);

callback.onRouteChanged(null, info);

- doReturn(false).when(info).matchesSelector(any(MediaRouteSelector.class));

+ doReturn(false).when(info).matchesSelector(isNull());

callback.onRouteChanged(null, info);

List<MediaSink> expectedSinks = new ArrayList<MediaSink>();

@@ -234,7 +233,7 @@ public class DiscoveryCallbackTest extends ChromeMediaRouterTestBase {

private MediaRouter.RouteInfo createMockRouteInfo(String sinkId, String sinkName) {

MediaRouter.RouteInfo route = spy(TestUtils.createMockRouteInfo(sinkId, sinkName));

- doReturn(true).when(route).matchesSelector(any(MediaRouteSelector.class));

+ doReturn(true).when(route).matchesSelector(isNull());

return route;

}