chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.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/compositor/overlays/strip/StripLayoutHelperTest.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/BUILD.gn ('k') | chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.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/compositor/overlays/strip/StripLayoutHelperTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java

index 489b56d6962739b8ce25c3a8606113e864ccdc6a..7b5396eb19284088f870945d8bda4c738d0f9ac7 100644

--- a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java

+++ b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java

@@ -9,6 +9,7 @@ import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Matchers.anyFloat;

import static org.mockito.Matchers.anyInt;

+import static org.mockito.Matchers.isNull;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;

@@ -17,7 +18,6 @@ import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.text.TextUtils;

-import android.util.AttributeSet;

import android.util.DisplayMetrics;

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

@@ -86,7 +86,7 @@ public class StripLayoutHelperTest {

final TypedArray mockTypedArray = mock(TypedArray.class);

when(mockTypedArray.getDimension(anyInt(), anyFloat())).thenReturn(0f);

when(mockTypedArray.getBoolean(anyInt(), anyBoolean())).thenReturn(false);

- when(mContext.obtainStyledAttributes(any(AttributeSet.class), any(int[].class), anyInt(),

+ when(mContext.obtainStyledAttributes(isNull(), any(int[].class), anyInt(),

anyInt())).thenReturn(mockTypedArray);

final Configuration mockConfiguration = mock(Configuration.class);

when(mResources.getConfiguration()).thenReturn(mockConfiguration);