android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.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: android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.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 | « android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/JavaScriptEvalChromeTest.java » ('j') | content/browser/frame_host/render_frame_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java

index 5f2b6ab99f3a570d2b2f781522c8e526687caaff..c522fa80f7efc9d34fff9f558a0bd2fcbe56ddd8 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java

@@ -47,7 +47,7 @@ public class JSUtils {

testCase.getInstrumentation().runOnMainSync(new Runnable() {

@Override

public void run() {

- awContents.getWebContents().evaluateJavaScript(

+ awContents.getWebContents().evaluateJavaScriptForTests(

"var evObj = document.createEvent('Events'); "

+ "evObj.initEvent('click', true, false); "

+ "document.getElementById('" + linkId + "').dispatchEvent(evObj);"

@@ -65,7 +65,7 @@ public class JSUtils {

testCase.getInstrumentation().runOnMainSync(new Runnable() {

@Override

public void run() {

- onEvaluateJavaScriptResultHelper.evaluateJavaScript(

+ onEvaluateJavaScriptResultHelper.evaluateJavaScriptForTests(

awContents.getWebContents(), code);

}

});