android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java - Issue 1707473002: Remove document.defaultCharset

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

Issue 1707473002: Remove document.defaultCharset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 10 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

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

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

index a9643c885d5de699fbaf92491ad7997d51e6c4aa..264b7382fc5bd6edb9d8c61eb46c266c47a101ca 100644

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

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

@@ -375,7 +375,6 @@ public class AwSettingsTest extends AwTestBase {

}

class AwSettingsImagesEnabledHelper extends AwSettingsTestHelper<Boolean> {

AwSettingsImagesEnabledHelper(

@@ -425,44 +424,6 @@ public class AwSettingsTest extends AwTestBase {

private ImagePageGenerator mGenerator;

}

- class AwSettingsDefaultTextEncodingTestHelper extends AwSettingsTestHelper<String> {

- AwSettingsDefaultTextEncodingTestHelper(

- AwTestContainerView containerView,

- TestAwContentsClient contentViewClient) throws Throwable {

- super(containerView, contentViewClient, true);

- }

- @Override

- protected String getAlteredValue() {

- return "Latin-1";

- }

- @Override

- protected String getInitialValue() {

- return "UTF-8";

- }

- @Override

- protected String getCurrentValue() {

- return mAwSettings.getDefaultTextEncodingName();

- }

- @Override

- protected void setCurrentValue(String value) {

- mAwSettings.setDefaultTextEncodingName(value);

- }

- @Override

- protected void doEnsureSettingHasValue(String value) throws Throwable {

- loadDataSync(getData());

- assertEquals(value, getTitleOnUiThread());

- }

- private String getData() {

- return "<html><body onload='document.title=document.defaultCharset'></body></html>";

- }

class AwSettingsUserAgentStringTestHelper extends AwSettingsTestHelper<String> {

private final String mDefaultUa;

private static final String DEFAULT_UA = "";

@@ -1591,7 +1552,6 @@ public class AwSettingsTest extends AwTestBase {

assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));

}

@SmallTest

@Feature({"AndroidWebView", "Preferences"})

public void testLoadsImagesAutomaticallyWithTwoViews() throws Throwable {

@@ -1603,17 +1563,6 @@ public class AwSettingsTest extends AwTestBase {

views.getContainer1(), views.getClient1(), new ImagePageGenerator(1, true)));

}

- @SmallTest

- @Feature({"AndroidWebView", "Preferences"})

mnaganov (inactive) 2016/02/17 16:42:48 Please do not remove any code. I will rework the t

philipj_slow 2016/02/17 16:52:09 Thanks for the guidance, I've made that change. I

- public void testDefaultTextEncodingWithTwoViews() throws Throwable {

- ViewPair views = createViews();

- runPerViewSettingsTest(

- new AwSettingsDefaultTextEncodingTestHelper(

- views.getContainer0(), views.getClient0()),

- new AwSettingsDefaultTextEncodingTestHelper(

- views.getContainer1(), views.getClient1()));

- }

// The test verifies that the default user agent string follows the format

// defined in Android CTS tests:

« no previous file with comments | « no previous file | android_webview/tools/WebViewShell/test/webexposed/global-interface-listing-expected.txt » ('j') | no next file with comments »