diff options
author | aurimas <aurimas@chromium.org> | 2014-11-20 10:46:00 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-20 18:46:15 +0000 |
commit | cee75f0a7905c9e232900252142853a8b11d9701 (patch) | |
tree | 93d58fa0f6324b05e350ca4d81ba7063117dc1d8 /android_webview/javatests/src | |
parent | 522a6a68af27cc55510c9d27b3407ff49143b9e3 (diff) | |
download | chromium_src-cee75f0a7905c9e232900252142853a8b11d9701.zip chromium_src-cee75f0a7905c9e232900252142853a8b11d9701.tar.gz chromium_src-cee75f0a7905c9e232900252142853a8b11d9701.tar.bz2 |
Fix a bunch of Java Checkstyle issues.
BUG=318404
TBR=samuong@chromium.org
Review URL: https://codereview.chromium.org/744453002
Cr-Commit-Position: refs/heads/master@{#305047}
Diffstat (limited to 'android_webview/javatests/src')
-rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java index 2930d39..40cf038 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java @@ -207,19 +207,18 @@ public class AndroidViewIntegrationTest extends AwTestBase { private String makeHtmlPageOfSize(int widthCss, int heightCss, boolean heightPercent) { String content = "<div class=\"normal\">a</div>"; if (heightPercent) content += "<div class=\"heightPercent\"></div>"; - return CommonResources.makeHtmlPageFrom( - "<style type=\"text/css\">" + - "body { margin:0px; padding:0px; } " + - ".normal { " + - "width:" + widthCss + "px; " + - "height:" + heightCss + "px; " + - "background-color: red; " + - "} " + - ".heightPercent { " + - "height: 150%; " + - "background-color: blue; " + - "} " + - "</style>", content); + return CommonResources.makeHtmlPageFrom("<style type=\"text/css\">" + + " body { margin:0px; padding:0px; } " + + " .normal { " + + " width:" + widthCss + "px; " + + " height:" + heightCss + "px; " + + " background-color: red; " + + " } " + + " .heightPercent { " + + " height: 150%; " + + " background-color: blue; " + + " } " + + "</style>", content); } private void waitForContentSizeToChangeTo(OnContentSizeChangedHelper helper, int callCount, @@ -227,8 +226,8 @@ public class AndroidViewIntegrationTest extends AwTestBase { final int maxSizeChangeNotificationsToWaitFor = 5; for (int i = 1; i <= maxSizeChangeNotificationsToWaitFor; i++) { helper.waitForCallback(callCount, i); - if ((heightCss == -1 || helper.getHeight() == heightCss) && - (widthCss == -1 || helper.getWidth() == widthCss)) { + if ((heightCss == -1 || helper.getHeight() == heightCss) + && (widthCss == -1 || helper.getWidth() == widthCss)) { break; } // This means that we hit the max number of iterations but the expected contents size @@ -282,16 +281,15 @@ public class AndroidViewIntegrationTest extends AwTestBase { final int widthCss = 142; final int heightCss = 180; - final String htmlData = CommonResources.makeHtmlPageFrom( - "<style type=\"text/css\">" + - " body { margin:0px; padding:0px; } " + - " div { " + - " position: absolute; " + - " width:" + widthCss + "px; " + - " height:" + heightCss + "px; " + - " background-color: red; " + - " } " + - "</style>", "<div>a</div>"); + final String htmlData = CommonResources.makeHtmlPageFrom("<style type=\"text/css\">" + + " body { margin:0px; padding:0px; } " + + " div { " + + " position: absolute; " + + " width:" + widthCss + "px; " + + " height:" + heightCss + "px; " + + " background-color: red; " + + " } " + + "</style>", "<div>a</div>"); final int contentSizeChangeCallCount = mOnContentSizeChangedHelper.getCallCount(); loadDataAsync(testContainerView.getAwContents(), htmlData, "text/html", false); |