android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java - Issue 2583933003: Replace deprecated Android java test annotations

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java

Issue 2583933003: Replace deprecated Android java test annotations (Closed)

Patch Set: Rebase again Created 4 years 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 unified diff | Download patch

« no previous file with comments | « PRESUBMIT_test.py ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java » ('j') | chrome/android/javatests/src/org/chromium/chrome/test/ParametersOnMultiTest.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 package org.chromium.android_webview.test;	5 package org.chromium.android_webview.test;

6	6

7 import android.annotation.SuppressLint;	7 import android.annotation.SuppressLint;

8 import android.os.Build;	8 import android.os.Build;

9 import android.os.LocaleList;	9 import android.os.LocaleList;

10 import android.test.suitebuilder.annotation.SmallTest;	10 import android.support.test.filters.SmallTest;

11 import android.text.TextUtils;	11 import android.text.TextUtils;

12	12

13 import org.chromium.android_webview.AwContents;	13 import org.chromium.android_webview.AwContents;

14 import org.chromium.android_webview.test.util.JSUtils;	14 import org.chromium.android_webview.test.util.JSUtils;

15 import org.chromium.base.LocaleUtils;	15 import org.chromium.base.LocaleUtils;

16 import org.chromium.base.test.util.Feature;	16 import org.chromium.base.test.util.Feature;

17 import org.chromium.base.test.util.MinAndroidSdkLevel;	17 import org.chromium.base.test.util.MinAndroidSdkLevel;

18 import org.chromium.net.test.EmbeddedTestServer;	18 import org.chromium.net.test.EmbeddedTestServer;

19	19

20 import java.util.Arrays;	20 import java.util.Arrays;

(...skipping 153 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
174	174

175 loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url) ;	175 loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url) ;

176	176

177 acceptLanguages = getAcceptLanguages(JSUtils.executeJavaScriptAndWaitFor Result(this,	177 acceptLanguages = getAcceptLanguages(JSUtils.executeJavaScriptAndWaitFor Result(this,

178 mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper (),	178 mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper (),

179 "document.body.textContent"));	179 "document.body.textContent"));

180 String[] acceptLangs = Arrays.copyOfRange(acceptLanguages, 0, acceptLang uages.length - 1);	180 String[] acceptLangs = Arrays.copyOfRange(acceptLanguages, 0, acceptLang uages.length - 1);

181 assertEquals(LocaleUtils.getDefaultLocaleListString(), TextUtils.join(", ", acceptLangs));	181 assertEquals(LocaleUtils.getDefaultLocaleListString(), TextUtils.join(", ", acceptLangs));

182 }	182 }

183 }	183 }

OLD	NEW