Fix tests and enable virtual viewport on Android WebView.

android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.content.Context;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
 import android.widget.OverScroller;
@@ skipping 117 matching lines @@
         };
     }
 
     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; " +
+            "      width:10px; " +
             "      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,
             String extraContent) {
         String content = TEST_PAGE_COMMON_CONTENT + extraContent;
         if (onscrollObserver != null) {
@@ skipping 125 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testUiScrollReflectedInJs() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
                 (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
         enableJavaScriptOnUiThread(testContainerView.getAwContents());
 
         final double deviceDIPScale =
                 DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
-        final int targetScrollXCss = 233;
+        final int targetScrollXCss = 0;
         final int targetScrollYCss = 322;
         final int targetScrollXPix = (int) Math.ceil(targetScrollXCss * deviceDIPScale);
         final int targetScrollYPix = (int) Math.ceil(targetScrollYCss * deviceDIPScale);
         final JavascriptEventObserver onscrollObserver = new JavascriptEventObserver();
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 onscrollObserver.register(testContainerView.getContentViewCore(),
                         "onscrollObserver");
@@ skipping 12 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testJsScrollReflectedInUi() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
                 (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
         enableJavaScriptOnUiThread(testContainerView.getAwContents());
 
         final double deviceDIPScale =
                 DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
-        final int targetScrollXCss = 132;
+        final int targetScrollXCss = 0;
         final int targetScrollYCss = 243;
         final int targetScrollXPix = (int) Math.floor(targetScrollXCss * deviceDIPScale);
         final int targetScrollYPix = (int) Math.floor(targetScrollYCss * deviceDIPScale);
 
         loadDataSync(testContainerView.getAwContents(), contentsClient.getOnPageFinishedHelper(),
                 makeTestPage(null, null, ""), "text/html", false);
 
         final CallbackHelper onScrollToCallbackHelper =
                 testContainerView.getOnScrollToCallbackHelper();
         final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
         executeJavaScriptAndWaitForResult(testContainerView.getAwContents(), contentsClient,
                 String.format("window.scrollTo(%d, %d);", targetScrollXCss, targetScrollYCss));
         onScrollToCallbackHelper.waitForCallback(scrollToCallCount);
 
         assertScrollOnMainSync(testContainerView, targetScrollXPix, targetScrollYPix);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testJsScrollFromBody() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
                 (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
         enableJavaScriptOnUiThread(testContainerView.getAwContents());
 
         final double deviceDIPScale =
                 DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
-        final int targetScrollXCss = 132;
+        final int targetScrollXCss = 0;
         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> ";
 
         final CallbackHelper onScrollToCallbackHelper =
                 testContainerView.getOnScrollToCallbackHelper();
         final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
         loadDataAsync(testContainerView.getAwContents(),
                 makeTestPage(null, null, scrollFromBodyScript), "text/html", false);
         onScrollToCallbackHelper.waitForCallback(scrollToCallCount);
 
         assertScrollOnMainSync(testContainerView, targetScrollXPix, targetScrollYPix);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testJsScrollCanBeAlteredByUi() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
                 (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
         enableJavaScriptOnUiThread(testContainerView.getAwContents());
 
         final double deviceDIPScale =
                 DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
-        final int targetScrollXCss = 132;
+        final int targetScrollXCss = 0;
         final int targetScrollYCss = 243;
         final int targetScrollXPix = (int) Math.floor(targetScrollXCss * deviceDIPScale);
         final int targetScrollYPix = (int) Math.floor(targetScrollYCss * deviceDIPScale);
 
-        final int maxScrollXCss = 101;
+        final int maxScrollXCss = 0;
         final int maxScrollYCss = 201;
         final int maxScrollXPix = (int) Math.floor(maxScrollXCss * deviceDIPScale);
         final int maxScrollYPix = (int) Math.floor(maxScrollYCss * deviceDIPScale);
 
         loadDataSync(testContainerView.getAwContents(), contentsClient.getOnPageFinishedHelper(),
                 makeTestPage(null, null, ""), "text/html", false);
 
         setMaxScrollOnMainSync(testContainerView, maxScrollXPix, maxScrollYPix);
 
         final CallbackHelper onScrollToCallbackHelper =
@@ skipping 16 matching lines @@
 
         final int dragSteps = 10;
         final int dragStepSize = 24;
         // Watch out when modifying - if the y or x delta aren't big enough vertical or horizontal
         // scroll snapping will kick in.
         final int targetScrollXPix = dragStepSize * dragSteps;
         final int targetScrollYPix = dragStepSize * dragSteps;
 
         final double deviceDIPScale =
                 DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
-        final int maxScrollXPix = 101;
+        final int maxScrollXPix = 0;
         final int maxScrollYPix = 211;
         // Make sure we can't hit these values simply as a result of scrolling.
         assert (maxScrollXPix % dragStepSize) != 0;

[mkosiba (inactive), 2014/11/03 11:38:58]

you'll need to take this out.

         assert (maxScrollYPix % dragStepSize) != 0;
         final int maxScrollXCss = (int) Math.floor(maxScrollXPix / deviceDIPScale);
         final int maxScrollYCss = (int) Math.floor(maxScrollYPix / deviceDIPScale);
 
         setMaxScrollOnMainSync(testContainerView, maxScrollXPix, maxScrollYPix);
 
         loadTestPageAndWaitForFirstFrame(testContainerView, contentsClient, null, "");
 
         final CallbackHelper onScrollToCallbackHelper =
                 testContainerView.getOnScrollToCallbackHelper();
@@ skipping 110 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testScrollToBottomAtPageScaleX0dot5() throws Throwable {
         // The idea behind this test is to check that scrolling to the bottom on ther renderer side
         // results in the view also reporting as being scrolled to the bottom.
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
                 (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
         enableJavaScriptOnUiThread(testContainerView.getAwContents());
 
-        final int targetScrollXCss = 1000;
+        final int targetScrollXCss = 0;
         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; " +
+                "      width:10px; " +
                 "      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();
 
         final CallbackHelper onScrollToCallbackHelper =
                 testContainerView.getOnScrollToCallbackHelper();
         int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
         executeJavaScriptAndWaitForResult(testContainerView.getAwContents(), contentsClient,
                 "window.scrollTo(" + targetScrollXCss + "," + targetScrollYCss + ")");
         onScrollToCallbackHelper.waitForCallback(scrollToCallCount);
 
-        getInstrumentation().runOnMainSync(new Runnable() {

[mkosiba (inactive), 2014/11/03 11:38:58]

If you're removing this bit then the rest of the test doesn't make much sense
(it's now asserting that if you call window.scrollTo(0, some large value); you
scroll somewhere...

Can we make any predictions about the vertical scroll offset? For example - is
it guaranteed to be within 2*(testContainerView.getHeight()) ? If not then let's
take the entire test out.

[aelias_OOO_until_Jul13, 2014/11/04 06:32:05]

We can make a loose prediction, but I don't think it would make this test cover
any behavior that's particularly useful to anybody, so I deleted it.

-            @Override
-            public void run() {
-                AwContents awContents = testContainerView.getAwContents();
-                int maxHorizontal = awContents.computeHorizontalScrollRange() -
-                                testContainerView.getWidth();
-                int maxVertical = awContents.computeVerticalScrollRange() -
-                                testContainerView.getHeight();
-                // Due to rounding going from CSS -> physical pixels it is possible that more than
-                // one physical pixels corespond to one CSS pixel, which is why we can't do a
-                // simple equality test here.
-                assertTrue(maxHorizontal - awContents.computeHorizontalScrollOffset() < 3);
-                assertTrue(maxVertical - awContents.computeVerticalScrollOffset() < 3);
-            }
-        });
-
         scrollToCallCount = onScrollToCallbackHelper.getCallCount();
         executeJavaScriptAndWaitForResult(testContainerView.getAwContents(), contentsClient,
                 "window.scrollTo(0, 0)");
         onScrollToCallbackHelper.waitForCallback(scrollToCallCount);
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 AwContents awContents = testContainerView.getAwContents();
                 int maxHorizontal = awContents.computeHorizontalScrollRange() -
@@ skipping 18 matching lines @@
 
         assertScrollOnMainSync(testContainerView, 0, 0);
 
         final CallbackHelper onScrollToCallbackHelper =
                 testContainerView.getOnScrollToCallbackHelper();
         final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                testContainerView.getAwContents().flingScroll(1000, 1000);
+                testContainerView.getAwContents().flingScroll(0, 1000);

[mkosiba (inactive), 2014/11/03 11:38:58]

there is a CTS test identical test to this. I'll need to remember to update it.

             }
         });
 
         onScrollToCallbackHelper.waitForCallback(scrollToCallCount);
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                assertTrue(testContainerView.getScrollX() > 0);
                 assertTrue(testContainerView.getScrollY() > 0);
             }
         });
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testPageDown() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
@@ skipping 179 matching lines @@
                 assertTrue(String.format(Locale.ENGLISH,
                         "Scroll range should increase after zoom (%d) > (%d)",
                         newScrollRange, oldScrollRange), newScrollRange > oldScrollRange);
                 assertEquals(awContents.getContentHeightCss(), oldContentHeightApproximation);
                 assertEquals(awContents.getContentHeightCss(), newContentHeightApproximation);
             }
         });
 
     }
 }