Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1110)

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

Issue 663573002: Fix Java indentation issues. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/AndroidScrollIntegrationTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
index bd75c076de100ff2511b155941506e171b17376f..5f8b8055297f56d19f49e2459edd0c283460b643 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
@@ -62,7 +62,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
private CallbackHelper mOnScrollToCallbackHelper = new CallbackHelper();
private OverScrollByCallbackHelper mOverScrollByCallbackHelper =
- new OverScrollByCallbackHelper();
+ new OverScrollByCallbackHelper();
public ScrollTestContainerView(Context context, boolean allowHardwareAcceleration) {
super(context, allowHardwareAcceleration);
@@ -129,17 +129,17 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
}
private static final String TEST_PAGE_COMMON_HEADERS =
- "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"> " +
- "<style type=\"text/css\"> " +
- " body { " +
- " margin: 0px; " +
- " } " +
- " div { " +
- " width:1000px; " +
- " height:10000px; " +
- " background-color: blue; " +
- " } " +
- "</style> ";
+ "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"> " +
+ "<style type=\"text/css\"> " +
+ " body { " +
+ " margin: 0px; " +
+ " } " +
+ " div { " +
+ " width:1000px; " +
+ " height:10000px; " +
+ " background-color: blue; " +
+ " } " +
+ "</style> ";
private static final String TEST_PAGE_COMMON_CONTENT = "<div>test div</div> ";
private String makeTestPage(String onscrollObserver, String firstFrameObserver,
@@ -198,7 +198,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
@Override
public void run() {
equal.set((scrollXPix == testContainerView.getScrollX()) &&
- (scrollYPix == testContainerView.getScrollY()));
+ (scrollYPix == testContainerView.getScrollY()));
}
});
return equal.get();
@@ -222,11 +222,11 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
@Override
public Boolean call() throws Exception {
String x = executeJavaScriptAndWaitForResult(awContents, contentsClient,
- "window.scrollX");
+ "window.scrollX");
String y = executeJavaScriptAndWaitForResult(awContents, contentsClient,
- "window.scrollY");
+ "window.scrollY");
return (Integer.toString(xCss).equals(x) &&
- Integer.toString(yCss).equals(y));
+ Integer.toString(yCss).equals(y));
}
});
}
@@ -234,12 +234,12 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
private void assertScrolledToBottomInJs(final AwContents awContents,
final TestAwContentsClient contentsClient) throws Exception {
final String isBottomScript = "window.scrollY == " +
- "(window.document.documentElement.scrollHeight - window.innerHeight)";
+ "(window.document.documentElement.scrollHeight - window.innerHeight)";
poll(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
String r = executeJavaScriptAndWaitForResult(awContents, contentsClient,
- isBottomScript);
+ isBottomScript);
return r.equals("true");
}
});
@@ -256,7 +256,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
@Override
public void run() {
firstFrameObserver.register(testContainerView.getContentViewCore(),
- firstFrameObserverName);
+ firstFrameObserverName);
}
});
@@ -276,11 +276,11 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testUiScrollReflectedInJs() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
enableJavaScriptOnUiThread(testContainerView.getAwContents());
final double deviceDIPScale =
- DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
+ DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
final int targetScrollXCss = 233;
final int targetScrollYCss = 322;
final int targetScrollXPix = (int) Math.ceil(targetScrollXCss * deviceDIPScale);
@@ -291,7 +291,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
@Override
public void run() {
onscrollObserver.register(testContainerView.getContentViewCore(),
- "onscrollObserver");
+ "onscrollObserver");
}
});
@@ -309,11 +309,11 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testJsScrollReflectedInUi() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
enableJavaScriptOnUiThread(testContainerView.getAwContents());
final double deviceDIPScale =
- DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
+ DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
final int targetScrollXCss = 132;
final int targetScrollYCss = 243;
final int targetScrollXPix = (int) Math.floor(targetScrollXCss * deviceDIPScale);
@@ -323,7 +323,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
makeTestPage(null, null, ""), "text/html", false);
final CallbackHelper onScrollToCallbackHelper =
- testContainerView.getOnScrollToCallbackHelper();
+ testContainerView.getOnScrollToCallbackHelper();
final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
executeJavaScriptAndWaitForResult(testContainerView.getAwContents(), contentsClient,
String.format("window.scrollTo(%d, %d);", targetScrollXCss, targetScrollYCss));
@@ -337,23 +337,23 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testJsScrollFromBody() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
enableJavaScriptOnUiThread(testContainerView.getAwContents());
final double deviceDIPScale =
- DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
+ DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
final int targetScrollXCss = 132;
final int targetScrollYCss = 243;
final int targetScrollXPix = (int) Math.floor(targetScrollXCss * deviceDIPScale);
final int targetScrollYPix = (int) Math.floor(targetScrollYCss * deviceDIPScale);
final String scrollFromBodyScript =
- "<script> " +
- " window.scrollTo(" + targetScrollXCss + ", " + targetScrollYCss + "); " +
- "</script> ";
+ "<script> " +
+ " window.scrollTo(" + targetScrollXCss + ", " + targetScrollYCss + "); " +
+ "</script> ";
final CallbackHelper onScrollToCallbackHelper =
- testContainerView.getOnScrollToCallbackHelper();
+ testContainerView.getOnScrollToCallbackHelper();
final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
loadDataAsync(testContainerView.getAwContents(),
makeTestPage(null, null, scrollFromBodyScript), "text/html", false);
@@ -367,11 +367,11 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testJsScrollCanBeAlteredByUi() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
enableJavaScriptOnUiThread(testContainerView.getAwContents());
final double deviceDIPScale =
- DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
+ DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
final int targetScrollXCss = 132;
final int targetScrollYCss = 243;
final int targetScrollXPix = (int) Math.floor(targetScrollXCss * deviceDIPScale);
@@ -388,7 +388,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
setMaxScrollOnMainSync(testContainerView, maxScrollXPix, maxScrollYPix);
final CallbackHelper onScrollToCallbackHelper =
- testContainerView.getOnScrollToCallbackHelper();
+ testContainerView.getOnScrollToCallbackHelper();
final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
executeJavaScriptAndWaitForResult(testContainerView.getAwContents(), contentsClient,
"window.scrollTo(" + targetScrollXCss + "," + targetScrollYCss + ")");
@@ -402,7 +402,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testTouchScrollCanBeAlteredByUi() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
enableJavaScriptOnUiThread(testContainerView.getAwContents());
final int dragSteps = 10;
@@ -413,7 +413,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
final int targetScrollYPix = dragStepSize * dragSteps;
final double deviceDIPScale =
- DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
+ DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
final int maxScrollXPix = 101;
final int maxScrollYPix = 211;
// Make sure we can't hit these values simply as a result of scrolling.
@@ -427,7 +427,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
loadTestPageAndWaitForFirstFrame(testContainerView, contentsClient, null, "");
final CallbackHelper onScrollToCallbackHelper =
- testContainerView.getOnScrollToCallbackHelper();
+ testContainerView.getOnScrollToCallbackHelper();
final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
AwTestTouchUtils.dragCompleteView(testContainerView,
0, -targetScrollXPix, // these need to be negative as we're scrolling down.
@@ -437,8 +437,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
for (int i = 1; i <= dragSteps; ++i) {
onScrollToCallbackHelper.waitForCallback(scrollToCallCount, i);
- if (checkScrollOnMainSync(testContainerView, maxScrollXPix, maxScrollYPix))
- break;
+ if (checkScrollOnMainSync(testContainerView, maxScrollXPix, maxScrollYPix)) break;
}
assertScrollOnMainSync(testContainerView, maxScrollXPix, maxScrollYPix);
@@ -451,7 +450,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testNoSpuriousOverScrolls() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
enableJavaScriptOnUiThread(testContainerView.getAwContents());
final int dragSteps = 1;
@@ -462,7 +461,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
loadTestPageAndWaitForFirstFrame(testContainerView, contentsClient, null, "");
final CallbackHelper onScrollToCallbackHelper =
- testContainerView.getOnScrollToCallbackHelper();
+ testContainerView.getOnScrollToCallbackHelper();
final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
CountDownLatch scrollingCompleteLatch = new CountDownLatch(1);
AwTestTouchUtils.dragCompleteView(testContainerView,
@@ -483,9 +482,9 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testOverScrollX() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
final OverScrollByCallbackHelper overScrollByCallbackHelper =
- testContainerView.getOverScrollByCallbackHelper();
+ testContainerView.getOverScrollByCallbackHelper();
enableJavaScriptOnUiThread(testContainerView.getAwContents());
final int overScrollDeltaX = 30;
@@ -516,9 +515,9 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testOverScrollY() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
final OverScrollByCallbackHelper overScrollByCallbackHelper =
- testContainerView.getOverScrollByCallbackHelper();
+ testContainerView.getOverScrollByCallbackHelper();
enableJavaScriptOnUiThread(testContainerView.getAwContents());
final int overScrollDeltaY = 30;
@@ -546,35 +545,35 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
// results in the view also reporting as being scrolled to the bottom.
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
enableJavaScriptOnUiThread(testContainerView.getAwContents());
final int targetScrollXCss = 1000;
final int targetScrollYCss = 10000;
final String pageHeaders =
- "<meta name=\"viewport\" content=\"width=device-width, initial-scale=0.6\"> " +
- "<style type=\"text/css\"> " +
- " div { " +
- " width:1000px; " +
- " height:10000px; " +
- " background-color: blue; " +
- " } " +
- " body { " +
- " margin: 0px; " +
- " padding: 0px; " +
- " } " +
- "</style> ";
+ "<meta name=\"viewport\" content=\"width=device-width, initial-scale=0.6\"> " +
+ "<style type=\"text/css\"> " +
+ " div { " +
+ " width:1000px; " +
+ " height:10000px; " +
+ " background-color: blue; " +
+ " } " +
+ " body { " +
+ " margin: 0px; " +
+ " padding: 0px; " +
+ " } " +
+ "</style> ";
loadDataSync(testContainerView.getAwContents(), contentsClient.getOnPageFinishedHelper(),
CommonResources.makeHtmlPageFrom(pageHeaders, TEST_PAGE_COMMON_CONTENT),
"text/html", false);
final double deviceDIPScale =
- DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
+ DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
final CallbackHelper onScrollToCallbackHelper =
- testContainerView.getOnScrollToCallbackHelper();
+ testContainerView.getOnScrollToCallbackHelper();
int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
executeJavaScriptAndWaitForResult(testContainerView.getAwContents(), contentsClient,
"window.scrollTo(" + targetScrollXCss + "," + targetScrollYCss + ")");
@@ -620,7 +619,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testFlingScroll() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
enableJavaScriptOnUiThread(testContainerView.getAwContents());
loadTestPageAndWaitForFirstFrame(testContainerView, contentsClient, null, "");
@@ -628,7 +627,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
assertScrollOnMainSync(testContainerView, 0, 0);
final CallbackHelper onScrollToCallbackHelper =
- testContainerView.getOnScrollToCallbackHelper();
+ testContainerView.getOnScrollToCallbackHelper();
final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
getInstrumentation().runOnMainSync(new Runnable() {
@@ -654,7 +653,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testPageDown() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
enableJavaScriptOnUiThread(testContainerView.getAwContents());
loadTestPageAndWaitForFirstFrame(testContainerView, contentsClient, null, "");
@@ -670,7 +669,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
});
final CallbackHelper onScrollToCallbackHelper =
- testContainerView.getOnScrollToCallbackHelper();
+ testContainerView.getOnScrollToCallbackHelper();
final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
getInstrumentation().runOnMainSync(new Runnable() {
@@ -683,8 +682,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
// Wait for the animation to hit the bottom of the page.
for (int i = 1;; ++i) {
onScrollToCallbackHelper.waitForCallback(scrollToCallCount, i);
- if (checkScrollOnMainSync(testContainerView, 0, maxScrollYPix))
- break;
+ if (checkScrollOnMainSync(testContainerView, 0, maxScrollYPix)) break;
}
}
@@ -693,11 +691,11 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testPageUp() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
enableJavaScriptOnUiThread(testContainerView.getAwContents());
final double deviceDIPScale =
- DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
+ DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
final int targetScrollYCss = 243;
final int targetScrollYPix = (int) Math.ceil(targetScrollYCss * deviceDIPScale);
@@ -708,7 +706,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
scrollToOnMainSync(testContainerView, 0, targetScrollYPix);
final CallbackHelper onScrollToCallbackHelper =
- testContainerView.getOnScrollToCallbackHelper();
+ testContainerView.getOnScrollToCallbackHelper();
final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
getInstrumentation().runOnMainSync(new Runnable() {
@@ -721,8 +719,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
// Wait for the animation to hit the bottom of the page.
for (int i = 1;; ++i) {
onScrollToCallbackHelper.waitForCallback(scrollToCallCount, i);
- if (checkScrollOnMainSync(testContainerView, 0, 0))
- break;
+ if (checkScrollOnMainSync(testContainerView, 0, 0)) break;
}
}
@@ -765,7 +762,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testTouchScrollingConsumesScrollByGesture() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
final TestGestureStateListener testGestureStateListener = new TestGestureStateListener();
enableJavaScriptOnUiThread(testContainerView.getAwContents());
@@ -789,7 +786,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
}
});
final CallbackHelper onScrollUpdateGestureConsumedHelper =
- testGestureStateListener.getOnScrollUpdateGestureConsumedHelper();
+ testGestureStateListener.getOnScrollUpdateGestureConsumedHelper();
final int callCount = onScrollUpdateGestureConsumedHelper.getCallCount();
AwTestTouchUtils.dragCompleteView(testContainerView,
@@ -805,9 +802,9 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
public void testPinchZoomUpdatesScrollRangeSynchronously() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
final ScrollTestContainerView testContainerView =
- (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+ (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
final OverScrollByCallbackHelper overScrollByCallbackHelper =
- testContainerView.getOverScrollByCallbackHelper();
+ testContainerView.getOverScrollByCallbackHelper();
final AwContents awContents = testContainerView.getAwContents();
enableJavaScriptOnUiThread(awContents);
@@ -819,18 +816,18 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
assertTrue(awContents.canZoomIn());
int oldScrollRange =
- awContents.computeVerticalScrollRange() - testContainerView.getHeight();
+ awContents.computeVerticalScrollRange() - testContainerView.getHeight();
float oldScale = awContents.getScale();
int oldContentHeightApproximation =
- (int) Math.ceil(awContents.computeVerticalScrollRange() / oldScale);
+ (int) Math.ceil(awContents.computeVerticalScrollRange() / oldScale);
awContents.zoomIn();
int newScrollRange =
- awContents.computeVerticalScrollRange() - testContainerView.getHeight();
+ awContents.computeVerticalScrollRange() - testContainerView.getHeight();
float newScale = awContents.getScale();
int newContentHeightApproximation =
- (int) Math.ceil(awContents.computeVerticalScrollRange() / newScale);
+ (int) Math.ceil(awContents.computeVerticalScrollRange() / newScale);
assertTrue(String.format(Locale.ENGLISH,
"Scale range should increase after zoom (%f) > (%f)",

Powered by Google App Engine
This is Rietveld 408576698