chrome/android/javatests/src/org/chromium/chrome/browser/ModalDialogTest.java - Issue 1258593002: Reland "Add ExecuteJavaScriptForTest and make all tests use it"

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/ModalDialogTest.java

Issue 1258593002: Reland "Add ExecuteJavaScriptForTest and make all tests use it" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 5 years, 5 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/JavaScriptEvalChromeTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java » ('j') | content/browser/frame_host/render_frame_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7cffc5bf0a92ac33a911e9c777342b062292a6c3..e7ccc6e09aab1a30646e64c43192e87a7c4fe279 100644

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

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

@@ -264,7 +264,8 @@ public class ModalDialogTest extends ChromeActivityTestCaseBase<ChromeActivity>

clickCancel(jsDialog);

scriptEvent.waitUntilHasValue();

- scriptEvent.evaluateJavaScript(getActivity().getCurrentContentViewCore().getWebContents(),

+ scriptEvent.evaluateJavaScriptForTests(

+ getActivity().getCurrentContentViewCore().getWebContents(),

"alert('Android');");

assertTrue("No further dialog boxes should be shown.", scriptEvent.waitUntilHasValue());

}

@@ -310,7 +311,8 @@ public class ModalDialogTest extends ChromeActivityTestCaseBase<ChromeActivity>

private OnEvaluateJavaScriptResultHelper executeJavaScriptAndWaitForDialog(

final OnEvaluateJavaScriptResultHelper helper, String script)

throws InterruptedException {

- helper.evaluateJavaScript(getActivity().getCurrentContentViewCore().getWebContents(),

+ helper.evaluateJavaScriptForTests(

+ getActivity().getCurrentContentViewCore().getWebContents(),

script);

boolean criteriaSatisfied = CriteriaHelper.pollForCriteria(

new JavascriptAppModalDialogShownCriteria(true));