android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java - Issue 98853009: Fixing Java style issues in android_webview.

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

Issue 98853009: Fixing Java style issues in android_webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Bo's nits Created 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.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/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 4ef523c5a8780480bfac1b9bac8dcb66681e6854..6ac3ab37ae80a08dd9f52f21fc6c88cbc30a1010 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

@@ -1,4 +1,4 @@

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

// found in the LICENSE file.

@@ -1063,7 +1063,7 @@ public class AwSettingsTest extends AwTestBase {

// text zoom values ratio.

final float ratiosDelta = Math.abs(

(actualFontSize / mInitialActualFontSize) -

- (value / (float)INITIAL_TEXT_ZOOM));

+ (value / (float) INITIAL_TEXT_ZOOM));

assertTrue(

"|(" + actualFontSize + " / " + mInitialActualFontSize + ") - (" +

value + " / " + INITIAL_TEXT_ZOOM + ")| = " + ratiosDelta,

@@ -1114,7 +1114,7 @@ public class AwSettingsTest extends AwTestBase {

// text zoom values ratio.

final float ratiosDelta = Math.abs(

(actualFontSize / mInitialActualFontSize) -

- (value / (float)INITIAL_TEXT_ZOOM));

+ (value / (float) INITIAL_TEXT_ZOOM));

assertTrue(

"|(" + actualFontSize + " / " + mInitialActualFontSize + ") - (" +

value + " / " + INITIAL_TEXT_ZOOM + ")| = " + ratiosDelta,

@@ -1123,8 +1123,8 @@ public class AwSettingsTest extends AwTestBase {

}

class AwSettingsJavaScriptPopupsTestHelper extends AwSettingsTestHelper<Boolean> {

- static private final String POPUP_ENABLED = "Popup enabled";

- static private final String POPUP_BLOCKED = "Popup blocked";

+ private static final String POPUP_ENABLED = "Popup enabled";

+ private static final String POPUP_BLOCKED = "Popup blocked";

AwSettingsJavaScriptPopupsTestHelper(

AwContents awContents,

@@ -1245,7 +1245,7 @@ public class AwSettingsTest extends AwTestBase {

// We specify a very high width value to make sure that it doesn't intersect with

// device screen widths (in DIP pixels).

class AwSettingsUseWideViewportTestHelper extends AwSettingsTestHelper<Boolean> {

- static private final String VIEWPORT_TAG_LAYOUT_WIDTH = "3000";

+ private static final String VIEWPORT_TAG_LAYOUT_WIDTH = "3000";

AwSettingsUseWideViewportTestHelper(

AwContents awContents,

@@ -1897,7 +1897,7 @@ public class AwSettingsTest extends AwTestBase {

CommonResources.getImagePngHeaders(true));

// Set up file html that loads http iframe.

- String pageHtml ="<img src='" + imageUrl + "' " +

+ String pageHtml = "<img src='" + imageUrl + "' " +

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

"onerror=\"document.title='img_onerror_fired';\" />";

Context context = getInstrumentation().getTargetContext();

@@ -1964,7 +1964,7 @@ public class AwSettingsTest extends AwTestBase {

// to know whether Url is accessed.

final String audioUrl = webServer.setResponse(httpPath, "1", null);

- String pageHtml ="<html><body><audio controls src='" + audioUrl + "' " +

+ String pageHtml = "<html><body><audio controls src='" + audioUrl + "' " +

"oncanplay=\"AudioEvent.onCanPlay();\" " +

"onerror=\"AudioEvent.onError();\" /> </body></html>";

// Actual test. Blocking should trigger onerror handler.

@@ -2524,7 +2524,7 @@ public class AwSettingsTest extends AwTestBase {

int height = screenSize.y * 2 + 1;

int width = screenSize.x * 2 + 1;

final String page = "<html><body>" +

- "<p style='height:"+ height + "px;width:" + width + "px'>" +

+ "<p style='height:" + height + "px;width:" + width + "px'>" +

"testSetInitialScale</p></body></html>";

final float defaultScale =

getInstrumentation().getTargetContext().getResources().getDisplayMetrics().density;

@@ -2588,8 +2588,7 @@ public class AwSettingsTest extends AwTestBase {

if (waitTime == -1) {

observer.waitForEvent();

return true;

- }

- else {

+ } else {

return observer.waitForEvent(waitTime);

}

} finally {

@@ -2809,8 +2808,8 @@ public class AwSettingsTest extends AwTestBase {

private void simulateDoubleTapCenterOfWebViewOnUiThread(final AwTestContainerView webView)

throws Throwable {

- final int x = (int)(webView.getRight() - webView.getLeft()) / 2;

- final int y = (int)(webView.getBottom() - webView.getTop()) / 2;

+ final int x = (webView.getRight() - webView.getLeft()) / 2;

+ final int y = (webView.getBottom() - webView.getTop()) / 2;

final AwContents awContents = webView.getAwContents();

runTestOnUiThread(new Runnable() {

@Override