weblayer: merge browser control related tests

This renames BottomControlsTest to BrowserControlsTest and
adds the top-control ones. Given how finicky these are it seems
best to conslidate them and share as much code as possible.

BUG=1074438,1077825
TEST=test only changes

Change-Id: I4f6544e93921688da78028e212c9ed3f530082b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2216383Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771967}

weblayer/browser/android/javatests/BUILD.gn

@@ -61,7 +61,7 @@ android_library("weblayer_java_tests") {
 android_library("weblayer_private_java_tests") {
   testonly = true
   sources = [
-    "src/org/chromium/weblayer/test/BottomControlsTest.java",
+    "src/org/chromium/weblayer/test/BrowserControlsTest.java",
     "src/org/chromium/weblayer/test/GeolocationTest.java",
     "src/org/chromium/weblayer/test/MediaCaptureTest.java",
     "src/org/chromium/weblayer/test/NetworkChangeNotifierTest.java",

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/BottomControlsTest.java → weblayer/browser/android/javatests/src/org/chromium/weblayer/test/BrowserControlsTest.java

@@ -11,14 +11,14 @@ import android.view.View;
 import android.widget.TextView;
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
-import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
@@ -30,15 +30,15 @@ import org.chromium.weblayer.shell.InstrumentationActivity;
  */
 @RunWith(WebLayerJUnit4ClassRunner.class)
 @CommandLineFlags.Add("enable-features=ImmediatelyHideBrowserControlsForTest")
-public class BottomControlsTest {
+public class BrowserControlsTest {
     @Rule
     public InstrumentationActivityTestRule mActivityTestRule =
             new InstrumentationActivityTestRule();
 
-    private int mMaxControlsHeight;
-    private int mTopControlsHeight;
-    private int mBottomControlsHeight;
-    private int mInitialVisiblePageHeight;
+    // Height of the top-view. Set in setUp().
+    private int mTopViewHeight;
+    // Height from the page (obtained using getVisiblePageHeight()) with the top-controls.
+    private int mPageHeightWithTopView;
 
     /**
      * Returns the visible height of the page as determined by JS. The returned value is in CSS
@@ -58,40 +58,43 @@ public class BottomControlsTest {
     // See TestWebLayer.waitForBrowserControlsMetadataState() for details on this.
     private void waitForBrowserControlsMetadataState(
             InstrumentationActivity activity, int top, int bottom) throws Exception {
-        BoundedCountDownLatch latch = new BoundedCountDownLatch(1);
+        CallbackHelper helper = new CallbackHelper();
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             try {
                 TestWebLayer.getTestWebLayer(activity.getApplicationContext())
                         .waitForBrowserControlsMetadataState(activity.getBrowser().getActiveTab(),
-                                top, bottom, () -> { latch.countDown(); });
+                                top, bottom, () -> { helper.notifyCalled(); });
             } catch (RemoteException e) {
                 throw new RuntimeException(e);
             }
         });
-        latch.timedAwait();
+        helper.waitForCallback(0);
     }
 
-    // Disabled on L bots due to unexplained flakes. See crbug.com/1035894.
-    @MinAndroidSdkLevel(Build.VERSION_CODES.M)
-    @Test
-    @SmallTest
-    public void testBasic() throws Exception {
+    @Before
+    public void setUp() throws Throwable {
         final String url = mActivityTestRule.getTestDataURL("tall_page.html");
         InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl(url);
 
         // Poll until the top view becomes visible.
         waitForBrowserControlsViewToBeVisible(activity.getTopContentsContainer());
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mMaxControlsHeight = mTopControlsHeight =
-                    activity.getTopContentsContainer().getHeight();
-            Assert.assertTrue(mMaxControlsHeight > 0);
+            mTopViewHeight = activity.getTopContentsContainer().getHeight();
+            Assert.assertTrue(mTopViewHeight > 0);
         });
 
         // Wait for cc to see the top-controls height.
-        waitForBrowserControlsMetadataState(activity, mTopControlsHeight, 0);
+        waitForBrowserControlsMetadataState(activity, mTopViewHeight, 0);
 
-        int pageHeightWithTopView = getVisiblePageHeight();
+        mPageHeightWithTopView = getVisiblePageHeight();
+    }
 
+    // Disabled on L bots due to unexplained flakes. See crbug.com/1035894.
+    @MinAndroidSdkLevel(Build.VERSION_CODES.M)
+    @Test
+    @SmallTest
+    public void testTopAndBottom() throws Exception {
+        InstrumentationActivity activity = mActivityTestRule.getActivity();
         View bottomView = TestThreadUtils.runOnUiThreadBlocking(() -> {
             TextView view = new TextView(activity);
             view.setText("BOTTOM");
@@ -101,37 +104,36 @@ public class BottomControlsTest {
 
         waitForBrowserControlsViewToBeVisible(bottomView);
 
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            // The amount necessary to scroll is the sum of the two views. This is because the page
-            // height is reduced by the sum of these two.
-            mBottomControlsHeight = bottomView.getHeight();
-            Assert.assertTrue(mBottomControlsHeight > 0);
-            mMaxControlsHeight += mBottomControlsHeight;
-        });
+        int bottomViewHeight =
+                TestThreadUtils.runOnUiThreadBlocking(() -> { return bottomView.getHeight(); });
+        Assert.assertTrue(bottomViewHeight > 0);
+        // The amount necessary to scroll is the sum of the two views. This is because the page
+        // height is reduced by the sum of these two.
+        int maxViewsHeight = mTopViewHeight + bottomViewHeight;
 
         // Wait for cc to see the bottom height. This is very important, as scrolling is gated by
         // cc getting the bottom height.
-        waitForBrowserControlsMetadataState(activity, mTopControlsHeight, mBottomControlsHeight);
+        waitForBrowserControlsMetadataState(activity, mTopViewHeight, bottomViewHeight);
 
         // Adding a bottom view should change the page height.
         CriteriaHelper.pollInstrumentationThread(
-                () -> Assert.assertNotEquals(getVisiblePageHeight(), pageHeightWithTopView));
+                () -> Assert.assertNotEquals(getVisiblePageHeight(), mPageHeightWithTopView));
         int pageHeightWithTopAndBottomViews = getVisiblePageHeight();
-        Assert.assertTrue(pageHeightWithTopAndBottomViews < pageHeightWithTopView);
+        Assert.assertTrue(pageHeightWithTopAndBottomViews < mPageHeightWithTopView);
 
         // Move by the size of the controls.
         EventUtils.simulateDragFromCenterOfView(
-                activity.getWindow().getDecorView(), 0, -mMaxControlsHeight);
+                activity.getWindow().getDecorView(), 0, -maxViewsHeight);
 
         // Moving should hide the bottom View.
         CriteriaHelper.pollUiThread(
                 Criteria.equals(View.INVISIBLE, () -> bottomView.getVisibility()));
         CriteriaHelper.pollInstrumentationThread(
-                Criteria.equals(true, () -> getVisiblePageHeight() > pageHeightWithTopView));
+                Criteria.equals(true, () -> getVisiblePageHeight() > mPageHeightWithTopView));
 
         // Move so top and bottom-controls are shown again.
         EventUtils.simulateDragFromCenterOfView(
-                activity.getWindow().getDecorView(), 0, mMaxControlsHeight);
+                activity.getWindow().getDecorView(), 0, maxViewsHeight);
 
         waitForBrowserControlsViewToBeVisible(bottomView);
         CriteriaHelper.pollInstrumentationThread(
@@ -142,30 +144,16 @@ public class BottomControlsTest {
     @MinAndroidSdkLevel(Build.VERSION_CODES.M)
     @Test
     @SmallTest
-    @DisabledTest
-    public void testNoTopControl() throws Exception {
-        final String url = UrlUtils.encodeHtmlDataUri("<body><p style='height:5000px'>");
-        InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl(url);
-
-        // Poll until the top view becomes visible.
-        CriteriaHelper.pollUiThread(Criteria.equals(
-                View.VISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
-
-        // Get the size of the page.
-        mInitialVisiblePageHeight = getVisiblePageHeight();
-        Assert.assertTrue(mInitialVisiblePageHeight > 0);
-
-        // Swap out the top-view.
+    public void testBottomOnly() throws Exception {
+        InstrumentationActivity activity = mActivityTestRule.getActivity();
+        // Remove the top-view.
         TestThreadUtils.runOnUiThreadBlocking(() -> { activity.getBrowser().setTopView(null); });
 
-        // Wait for the size of the page to change. Don't attempt to correlate the size as the
-        // page doesn't see pixels, and to attempt to compare may result in rounding errors. Poll
-        // for this value as there is no good way to detect when done.
-        CriteriaHelper.pollInstrumentationThread(
-                () -> Assert.assertNotEquals(mInitialVisiblePageHeight, getVisiblePageHeight()));
+        // Wait for cc to see the top-controls height change.
+        waitForBrowserControlsMetadataState(activity, 0, 0);
 
-        // Reset mInitialVisiblePageHeight as the top-view is no longer present.
-        mInitialVisiblePageHeight = getVisiblePageHeight();
+        int pageHeightWithNoTopView = getVisiblePageHeight();
+        Assert.assertNotEquals(pageHeightWithNoTopView, mPageHeightWithTopView);
 
         // Add in the bottom-view.
         View bottomView = TestThreadUtils.runOnUiThreadBlocking(() -> {
@@ -175,41 +163,89 @@ public class BottomControlsTest {
             return view;
         });
 
-        // Poll until the bottom view becomes visible.
-        CriteriaHelper.pollUiThread(
-                Criteria.equals(View.VISIBLE, () -> bottomView.getVisibility()));
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mMaxControlsHeight = bottomView.getHeight();
-            Assert.assertTrue(mMaxControlsHeight > 0);
-        });
+        waitForBrowserControlsViewToBeVisible(bottomView);
+        int bottomViewHeight =
+                TestThreadUtils.runOnUiThreadBlocking(() -> { return bottomView.getHeight(); });
+        Assert.assertTrue(bottomViewHeight > 0);
+        // Wait for cc to see the bottom-controls height change.
+        waitForBrowserControlsMetadataState(activity, 0, bottomViewHeight);
 
-        CriteriaHelper.pollInstrumentationThread(
-                () -> Assert.assertNotEquals(mInitialVisiblePageHeight, getVisiblePageHeight()));
+        int pageHeightWithBottomView = getVisiblePageHeight();
+        Assert.assertNotEquals(pageHeightWithNoTopView, pageHeightWithBottomView);
 
         // Move by the size of the bottom-controls.
         EventUtils.simulateDragFromCenterOfView(
-                activity.getWindow().getDecorView(), 0, -mMaxControlsHeight);
+                activity.getWindow().getDecorView(), 0, -bottomViewHeight);
 
         // Moving should hide the bottom-controls View.
         CriteriaHelper.pollUiThread(
                 Criteria.equals(View.INVISIBLE, () -> bottomView.getVisibility()));
-
-        // Moving should change the size of the page. Don't attempt to correlate the size as the
-        // page doesn't see pixels, and to attempt to compare may result in rounding errors. Poll
-        // for this value as there is no good way to detect when done.
         CriteriaHelper.pollInstrumentationThread(
-                Criteria.equals(mInitialVisiblePageHeight, this::getVisiblePageHeight));
+                Criteria.equals(pageHeightWithNoTopView, () -> getVisiblePageHeight()));
 
         // Move so bottom-controls are shown again.
         EventUtils.simulateDragFromCenterOfView(
-                activity.getWindow().getDecorView(), 0, mMaxControlsHeight);
+                activity.getWindow().getDecorView(), 0, bottomViewHeight);
 
-        // bottom-controls are shown async.
-        CriteriaHelper.pollUiThread(
-                Criteria.equals(View.VISIBLE, () -> bottomView.getVisibility()));
+        waitForBrowserControlsViewToBeVisible(bottomView);
+        CriteriaHelper.pollInstrumentationThread(
+                () -> Assert.assertEquals(getVisiblePageHeight(), pageHeightWithBottomView));
+    }
+
+    // Disabled on L bots due to unexplained flakes. See crbug.com/1035894.
+    @MinAndroidSdkLevel(Build.VERSION_CODES.M)
+    @Test
+    @SmallTest
+    public void testTopOnly() throws Exception {
+        InstrumentationActivity activity = mActivityTestRule.getActivity();
+        View topView = activity.getTopContentsContainer();
+
+        // Move by the size of the top-controls.
+        EventUtils.simulateDragFromCenterOfView(
+                activity.getWindow().getDecorView(), 0, -mTopViewHeight);
+
+        // Moving should hide the top-controls and change the page height.
+        CriteriaHelper.pollUiThread(Criteria.equals(View.INVISIBLE, () -> topView.getVisibility()));
+        CriteriaHelper.pollInstrumentationThread(
+                () -> Assert.assertNotEquals(getVisiblePageHeight(), mPageHeightWithTopView));
+
+        // Move so top-controls are shown again.
+        EventUtils.simulateDragFromCenterOfView(
+                activity.getWindow().getDecorView(), 0, mTopViewHeight);
 
         // Wait for the page height to match initial height.
+        waitForBrowserControlsViewToBeVisible(topView);
         CriteriaHelper.pollInstrumentationThread(
-                () -> Assert.assertNotEquals(mInitialVisiblePageHeight, getVisiblePageHeight()));
+                () -> Assert.assertEquals(getVisiblePageHeight(), mPageHeightWithTopView));
+    }
+
+    /**
+     * Makes sure that the top controls are shown when a js dialog is shown.
+     *
+     * Regression test for https://crbug.com/1078181.
+     *
+     * Disabled on L bots due to unexplained flakes. See crbug.com/1035894.
+     */
+    @MinAndroidSdkLevel(Build.VERSION_CODES.M)
+    @Test
+    @SmallTest
+    public void testAlertShowsTopControls() throws Exception {
+        InstrumentationActivity activity = mActivityTestRule.getActivity();
+
+        // Move by the size of the top-controls.
+        EventUtils.simulateDragFromCenterOfView(
+                activity.getWindow().getDecorView(), 0, -mTopViewHeight);
+
+        // Wait till top controls are invisible.
+        CriteriaHelper.pollUiThread(Criteria.equals(
+                View.INVISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
+
+        // Trigger an alert dialog.
+        mActivityTestRule.executeScriptSync(
+                "window.setTimeout(function() { alert('alert'); }, 1);", false);
+
+        // Top controls are shown.
+        CriteriaHelper.pollUiThread(Criteria.equals(
+                View.VISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
     }
 }

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java

@@ -4,25 +4,18 @@
 
 package org.chromium.weblayer.test;
 
-import android.os.Build;
 import android.support.test.filters.SmallTest;
-import android.view.View;
 import android.widget.FrameLayout;
 
 import androidx.fragment.app.Fragment;
 
-import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.FlakyTest;
-import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.base.test.util.UrlUtils;
-import org.chromium.content_public.browser.test.util.Criteria;
-import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.weblayer.Browser;
 import org.chromium.weblayer.Tab;
@@ -39,19 +32,9 @@ public class TopControlsTest {
     public InstrumentationActivityTestRule mActivityTestRule =
             new InstrumentationActivityTestRule();
 
-    private int mTopControlsHeight;
-    private int mInitialVisiblePageHeight;
     private Tab mTab;
     private Browser mBrowser;
 
-    /**
-     * Returns the visible height of the page as determined by JS. The returned value is in CSS
-     * pixels (which are most likely not the same as device pixels).
-     */
-    private int getVisiblePageHeight() {
-        return mActivityTestRule.executeScriptAndExtractInt("window.innerHeight");
-    }
-
     @Test
     @SmallTest
     public void testZeroHeight() throws Exception {
@@ -77,92 +60,4 @@ public class TopControlsTest {
         helper.waitForCallback(0);
     }
 
-    // Disabled on L bots due to unexplained flakes. See crbug.com/1035894.
-    @FlakyTest(message = "https://crbug.com/1074438")
-    @MinAndroidSdkLevel(Build.VERSION_CODES.M)
-    @Test
-    @SmallTest
-    public void testBasic() throws Exception {
-        final String url = UrlUtils.encodeHtmlDataUri("<body><p style='height:5000px'>");
-        InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl(url);
-
-        // Poll until the top view becomes visible.
-        CriteriaHelper.pollUiThread(Criteria.equals(
-                View.VISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mTopControlsHeight = activity.getTopContentsContainer().getHeight();
-            Assert.assertTrue(mTopControlsHeight > 0);
-        });
-
-        // Get the size of the page.
-        mInitialVisiblePageHeight = getVisiblePageHeight();
-        Assert.assertTrue(mInitialVisiblePageHeight > 0);
-
-        // Move by the size of the top-controls.
-        EventUtils.simulateDragFromCenterOfView(
-                activity.getWindow().getDecorView(), 0, -mTopControlsHeight);
-
-        // Moving should change the size of the page. Don't attempt to correlate the size as the
-        // page doesn't see pixels, and to attempt to compare may result in rounding errors. Poll
-        // for this value as there is no good way to detect when done.
-        CriteriaHelper.pollInstrumentationThread(
-                () -> Assert.assertNotEquals(mInitialVisiblePageHeight, getVisiblePageHeight()));
-
-        // Moving should also hide the top-controls View.
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            Assert.assertEquals(View.INVISIBLE, activity.getTopContentsContainer().getVisibility());
-        });
-
-        // Move so top-controls are shown again.
-        EventUtils.simulateDragFromCenterOfView(
-                activity.getWindow().getDecorView(), 0, mTopControlsHeight);
-
-        // Wait for the page height to match initial height.
-        CriteriaHelper.pollInstrumentationThread(
-                Criteria.equals(mInitialVisiblePageHeight, this::getVisiblePageHeight));
-
-        // top-controls are shown async.
-        CriteriaHelper.pollUiThread(Criteria.equals(
-                View.VISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
-    }
-
-    /**
-     * Makes sure that the top controls are shown when a js dialog is shown.
-     *
-     * Regression test for https://crbug.com/1078181.
-     *
-     * Disabled on L bots due to unexplained flakes. See crbug.com/1035894.
-     */
-    @FlakyTest(message = "https://crbug.com/1074438")
-    @MinAndroidSdkLevel(Build.VERSION_CODES.M)
-    @Test
-    @SmallTest
-    public void testAlertShowsTopControls() throws Exception {
-        final String url = UrlUtils.encodeHtmlDataUri("<body><p style='height:5000px'>");
-        InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl(url);
-
-        // Poll until the top view becomes visible.
-        CriteriaHelper.pollUiThread(Criteria.equals(
-                View.VISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mTopControlsHeight = activity.getTopContentsContainer().getHeight();
-            Assert.assertTrue(mTopControlsHeight > 0);
-        });
-
-        // Move by the size of the top-controls.
-        EventUtils.simulateDragFromCenterOfView(
-                activity.getWindow().getDecorView(), 0, -mTopControlsHeight);
-
-        // Wait till top controls are invisible.
-        CriteriaHelper.pollUiThread(Criteria.equals(
-                View.INVISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
-
-        // Trigger an alert dialog.
-        mActivityTestRule.executeScriptSync(
-                "window.setTimeout(function() { alert('alert'); }, 1);", false);
-
-        // Top controls are shown.
-        CriteriaHelper.pollUiThread(Criteria.equals(
-                View.VISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
-    }
 }