android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.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/AcceptLanguageTest.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/AndroidManifest.xml ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwActivityTestRule.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/AcceptLanguageTest.java

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

index fdbc21483e790307f0a9fafc35a3cc73dfb69c28..187b39814c4633cc00712cb4b19eeda64d681d1e 100644

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

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

@@ -85,9 +85,9 @@ public class AcceptLanguageTest extends AwTestBase {

getJavaScriptResultBodyTextContent(mAwContents, mContentsClient));

assertEquals(LocaleUtils.getDefaultLocaleString(), acceptLanguages[0]);

- String[] acceptLanguagesJs = getAcceptLanguages(

- JSUtils.executeJavaScriptAndWaitForResult(

- this, mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),

+ String[] acceptLanguagesJs =

+ getAcceptLanguages(JSUtils.executeJavaScriptAndWaitForResult(getInstrumentation(),

+ mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),

"navigator.languages.join(',')"));

assertEquals(acceptLanguagesJs.length, acceptLanguages.length);

for (int i = 0; i < acceptLanguagesJs.length; ++i) {

@@ -128,9 +128,10 @@ public class AcceptLanguageTest extends AwTestBase {

assertEquals(

LocaleUtils.getDefaultLocaleListString(), TextUtils.join(",", acceptLanguages));

- String[] acceptLanguagesJs = getAcceptLanguages(JSUtils.executeJavaScriptAndWaitForResult(

- this, mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),

- "navigator.languages.join(',')"));

+ String[] acceptLanguagesJs =

+ getAcceptLanguages(JSUtils.executeJavaScriptAndWaitForResult(getInstrumentation(),

+ mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),

+ "navigator.languages.join(',')"));

assertEquals(acceptLanguagesJs.length, acceptLanguages.length);

for (int i = 0; i < acceptLanguagesJs.length; ++i) {

assertEquals(acceptLanguagesJs[i], acceptLanguages[i]);