android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java - Issue 543553002: [Checkstyle] Enable additional name checks for Java.

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

Issue 543553002: [Checkstyle] Enable additional name checks for Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 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/KeySystemTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 65b90dc0614f79e91fb1950a342d263bafbc243d..04a176ed8090e22a61bb8b530fb5a8ba49fb979f 100644

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

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

@@ -274,12 +274,12 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

* base URL.

private boolean canAccessFileFromData(String baseUrl, String fileUrl) throws Throwable {

- final String IMAGE_LOADED = "LOADED";

- final String IMAGE_NOT_LOADED = "NOT_LOADED";

+ final String imageLoaded = "LOADED";

+ final String imageNotLoaded = "NOT_LOADED";

String data = "<html><body>" +

"<img src=\"" + fileUrl + "\" " +

- "onload=\"document.title=\'" + IMAGE_LOADED + "\';\" " +

- "onerror=\"document.title=\'" + IMAGE_NOT_LOADED + "\';\" />" +

+ "onload=\"document.title=\'" + imageLoaded + "\';\" " +

+ "onerror=\"document.title=\'" + imageNotLoaded + "\';\" />" +

"</body></html>";

loadDataWithBaseUrlSync(data, "text/html", false, baseUrl, null);

@@ -288,11 +288,11 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

@Override

public Boolean call() throws Exception {

String title = getTitleOnUiThread(mAwContents);

- return IMAGE_LOADED.equals(title) || IMAGE_NOT_LOADED.equals(title);

+ return imageLoaded.equals(title) || imageNotLoaded.equals(title);

}

});

- return IMAGE_LOADED.equals(getTitleOnUiThread(mAwContents));

+ return imageLoaded.equals(getTitleOnUiThread(mAwContents));

}

@SmallTest

@@ -312,27 +312,27 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

contentSettings.setJavaScriptEnabled(true);

try {

- final String DATA_BASE_URL = "data:";

- final String NON_DATA_BASE_URL = "http://example.com";

+ final String dataBaseUrl = "data:";

+ final String nonDataBaseUrl = "http://example.com";

mAwContents.getSettings().setAllowFileAccess(false);

String token = "" + System.currentTimeMillis();

// All access to file://, including android_asset and android_res is blocked

// with a data: base URL, regardless of AwSettings.getAllowFileAccess().

- assertFalse(canAccessFileFromData(DATA_BASE_URL,

+ assertFalse(canAccessFileFromData(dataBaseUrl,

"file:///android_asset/asset_icon.png?" + token));

- assertFalse(canAccessFileFromData(DATA_BASE_URL,

+ assertFalse(canAccessFileFromData(dataBaseUrl,

"file:///android_res/raw/resource_icon.png?" + token));

- assertFalse(canAccessFileFromData(DATA_BASE_URL, "file://" + imagePath + "?" + token));

+ assertFalse(canAccessFileFromData(dataBaseUrl, "file://" + imagePath + "?" + token));

// WebView always has access to android_asset and android_res for non-data

// base URLs and can access other file:// URLs based on the value of

// AwSettings.getAllowFileAccess().

- assertTrue(canAccessFileFromData(NON_DATA_BASE_URL,

+ assertTrue(canAccessFileFromData(nonDataBaseUrl,

"file:///android_asset/asset_icon.png?" + token));

- assertTrue(canAccessFileFromData(NON_DATA_BASE_URL,

+ assertTrue(canAccessFileFromData(nonDataBaseUrl,

"file:///android_res/raw/resource_icon.png?" + token));

- assertFalse(canAccessFileFromData(NON_DATA_BASE_URL,

+ assertFalse(canAccessFileFromData(nonDataBaseUrl,

"file://" + imagePath + "?" + token));

token += "a";

@@ -340,17 +340,17 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

// We should still be unable to access any file:// with when loading with a

// data: base URL, but we should now be able to access the wider file system

// (still restricted by OS-level permission checks) with a non-data base URL.

- assertFalse(canAccessFileFromData(DATA_BASE_URL,

+ assertFalse(canAccessFileFromData(dataBaseUrl,

"file:///android_asset/asset_icon.png?" + token));

- assertFalse(canAccessFileFromData(DATA_BASE_URL,

+ assertFalse(canAccessFileFromData(dataBaseUrl,

"file:///android_res/raw/resource_icon.png?" + token));

- assertFalse(canAccessFileFromData(DATA_BASE_URL, "file://" + imagePath + "?" + token));

+ assertFalse(canAccessFileFromData(dataBaseUrl, "file://" + imagePath + "?" + token));

- assertTrue(canAccessFileFromData(NON_DATA_BASE_URL,

+ assertTrue(canAccessFileFromData(nonDataBaseUrl,

"file:///android_asset/asset_icon.png?" + token));

- assertTrue(canAccessFileFromData(NON_DATA_BASE_URL,

+ assertTrue(canAccessFileFromData(nonDataBaseUrl,

"file:///android_res/raw/resource_icon.png?" + token));

- assertTrue(canAccessFileFromData(NON_DATA_BASE_URL,

+ assertTrue(canAccessFileFromData(nonDataBaseUrl,

"file://" + imagePath + "?" + token));

} finally {

if (!tempImage.delete()) throw new AssertionError();