chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java - Issue 1786243003: Rename pollForCriteria to pollForTestThreadCriteria.

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/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java

Issue 1786243003: Rename pollForCriteria to pollForTestThreadCriteria. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and update MediaRouterIntegrationTest.java Created 4 years, 9 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/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/TabTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java

index 0788ce37122d517379d3daeb8fadd22beaf3b969..a2dbc05551f1cf1f6d42111358dddc3b41e68846 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java

@@ -106,12 +106,12 @@ public class SelectFileDialogTest extends ChromeActivityTestCaseBase<ChromeActiv

@DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/592627")

public void testSelectFileAndCancelRequest() throws Throwable {

DOMUtils.clickNode(this, mContentViewCore, "input_file");

- CriteriaHelper.pollForCriteria(new IntentSentCriteria());

+ CriteriaHelper.pollInstrumentationThread(new IntentSentCriteria());

assertEquals(Intent.ACTION_CHOOSER, mActivityWindowAndroidForTest.lastIntent.getAction());

resetActivityWindowAndroidForTest();

DOMUtils.clickNode(this, mContentViewCore, "input_file_multiple");

- CriteriaHelper.pollForCriteria(new IntentSentCriteria());

+ CriteriaHelper.pollInstrumentationThread(new IntentSentCriteria());

assertEquals(Intent.ACTION_CHOOSER, mActivityWindowAndroidForTest.lastIntent.getAction());

Intent contentIntent = (Intent)

mActivityWindowAndroidForTest.lastIntent.getParcelableExtra(Intent.EXTRA_INTENT);

@@ -122,13 +122,13 @@ public class SelectFileDialogTest extends ChromeActivityTestCaseBase<ChromeActiv

resetActivityWindowAndroidForTest();

DOMUtils.clickNode(this, mContentViewCore, "input_image");

- CriteriaHelper.pollForCriteria(new IntentSentCriteria());

+ CriteriaHelper.pollInstrumentationThread(new IntentSentCriteria());

assertEquals(MediaStore.ACTION_IMAGE_CAPTURE,

mActivityWindowAndroidForTest.lastIntent.getAction());

resetActivityWindowAndroidForTest();

DOMUtils.clickNode(this, mContentViewCore, "input_audio");

- CriteriaHelper.pollForCriteria(new IntentSentCriteria());

+ CriteriaHelper.pollInstrumentationThread(new IntentSentCriteria());

assertEquals(MediaStore.Audio.Media.RECORD_SOUND_ACTION,

mActivityWindowAndroidForTest.lastIntent.getAction());

resetActivityWindowAndroidForTest();