android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java - Issue 2933623002: Create AwJUnit4ClassRunner AwActivityTestRule and convert AwContentsTest

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

Issue 2933623002: Create AwJUnit4ClassRunner AwActivityTestRule and convert AwContentsTest (Closed)

Patch Set: address bo's comments Created 3 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/AwContentsClientShouldInterceptRequestTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java » ('j') | android_webview/test/shell/src/org/chromium/android_webview/test/AwJUnit4ClassRunner.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java

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

index c02be0dc9c2941e482d4c19bfc4e0e54d86ad0c5..28090bd1140e619ea80f9e8af601b9e3c19aeaeb 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java

@@ -78,7 +78,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {

private void clickOnLinkUsingJs() throws Throwable {

enableJavaScriptOnUiThread(mAwContents);

- JSUtils.clickOnLinkUsingJs(this, mAwContents,

+ JSUtils.clickOnLinkUsingJs(getInstrumentation(), mAwContents,

mContentsClient.getOnEvaluateJavaScriptResultHelper(), "link");

}

@@ -926,8 +926,9 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {

loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), urlWithLink);

// Executing JS code that tries to navigate somewhere should not create an intent.

- assertEquals("\"" + testUrl + "\"", JSUtils.executeJavaScriptAndWaitForResult(

- this, mAwContents, new OnEvaluateJavaScriptResultHelper(),

+ assertEquals("\"" + testUrl + "\"",

+ JSUtils.executeJavaScriptAndWaitForResult(getInstrumentation(), mAwContents,

+ new OnEvaluateJavaScriptResultHelper(),

"document.location.href='" + testUrl + "'"));

assertNull(getActivity().getLastSentIntent());