components/policy/android/junit/src/org/chromium/policy/AbstractAppRestrictionsProviderTest.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: components/policy/android/junit/src/org/chromium/policy/AbstractAppRestrictionsProviderTest.java

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

Patch Set: Adding myself to junit OWNERS 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 | « components/policy/android/BUILD.gn ('k') | components/policy/android/junit/src/org/chromium/policy/CombinedPolicyProviderTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/android/junit/src/org/chromium/policy/AbstractAppRestrictionsProviderTest.java

diff --git a/components/policy/android/junit/src/org/chromium/policy/AbstractAppRestrictionsProviderTest.java b/components/policy/android/junit/src/org/chromium/policy/AbstractAppRestrictionsProviderTest.java

index 4dc6887cb6872d7a342b1d4e58e68b0bfebb15ce..d556ef02d413459e4937aecc53fe33c7476cec06 100644

--- a/components/policy/android/junit/src/org/chromium/policy/AbstractAppRestrictionsProviderTest.java

+++ b/components/policy/android/junit/src/org/chromium/policy/AbstractAppRestrictionsProviderTest.java

@@ -4,10 +4,11 @@

package org.chromium.policy;

-import static org.mockito.Matchers.any;

-import static org.mockito.Matchers.anyBoolean;

-import static org.mockito.Matchers.anyInt;

-import static org.mockito.Matchers.anyString;

+import static org.mockito.ArgumentMatchers.any;

+import static org.mockito.ArgumentMatchers.anyBoolean;

+import static org.mockito.ArgumentMatchers.anyInt;

+import static org.mockito.ArgumentMatchers.anyLong;

+import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

@@ -96,7 +97,7 @@ public class AbstractAppRestrictionsProviderTest {

AbstractAppRestrictionsProvider provider = spy(new DummyAppRestrictionsProvider(context));

provider.setTaskExecutor(new TestExecutor());

doNothing().when(provider).recordCacheLoadResultHistogram(anyBoolean());

- doNothing().when(provider).recordStartTimeHistogram(anyInt());

+ doNothing().when(provider).recordStartTimeHistogram(anyLong());

// Set up the buffer to be returned by getApplicationRestrictions.

when(provider.getApplicationRestrictions(anyString())).thenReturn(b1);

@@ -113,7 +114,7 @@ public class AbstractAppRestrictionsProviderTest {

Robolectric.getBackgroundThreadScheduler().advanceBy(0);

// The AsyncTask should now have got the restrictions.

verify(provider).getApplicationRestrictions(anyString());

- verify(provider).recordStartTimeHistogram(anyInt());

+ verify(provider).recordStartTimeHistogram(anyLong());

ShadowLooper.runUiThreadTasks();

// The policies should now have been set.