chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java - Issue 1387633002: Update instrumentation tests to use PreTestHooks for policies

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/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

Issue 1387633002: Update instrumentation tests to use PreTestHooks for policies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments, use a map instead of hacking PolicyData's equality Created 5 years, 1 month 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

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

index 16cfa52eb617d161d75c280cfac7c71aaed4cab4..2abc1717fbf47f2923d4722ff42eb589fc695a90 100644

--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

@@ -19,6 +19,7 @@

import org.chromium.chrome.browser.util.FeatureUtilities;

import org.chromium.chrome.test.util.DisableInTabbedMode;

import org.chromium.net.test.BaseHttpTestServer;

+import org.chromium.policy.test.annotations.Policies;

import org.chromium.ui.base.DeviceFormFactor;

import java.io.File;

@@ -214,6 +215,8 @@ protected void addTestHooks(BaseTestResult result) {

super.addTestHooks(result);

result.addSkipCheck(new DisableInTabbedModeSkipCheck());

result.addSkipCheck(new ChromeRestrictionSkipCheck());

+ result.addPreTestHook(Policies.getRegistrationHook());

}

private class ChromeRestrictionSkipCheck extends RestrictionSkipCheck {

« no previous file with comments | « chrome/test/android/BUILD.gn ('k') | components/components_tests.gyp » ('j') | no next file with comments »