base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java - Issue 1952573002: Add DisableIf annotation to EME test

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: base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java

Issue 1952573002: Add DisableIf annotation to EME test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor format changes Created 4 years, 7 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

« base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java ('K') | « base/test/android/javatests/src/org/chromium/base/test/util/DisableIf.java ('k') | blimp/client/app/android/javatests/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java

diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java

index a2dfafa598781e04d0339ef302ef02ce754bfeb9..4e95af705b4ad4e7aea70fa37389cb029ea0d826 100644

--- a/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java

+++ b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java

@@ -60,6 +60,11 @@ public class DisableIfSkipCheck extends SkipCheck {

return v.hardware_is().isEmpty() || Build.HARDWARE.equals(v.hardware_is());

}

+ private boolean product(DisableIf.Build v) {

+ return v.product_name_includes().isEmpty()

+ || Build.PRODUCT.contains(v.product_name_includes());

+ }

private boolean sdk(DisableIf.Build v) {

return Build.VERSION.SDK_INT > v.sdk_is_greater_than()

&& Build.VERSION.SDK_INT < v.sdk_is_less_than();