[WebLayer] Fix flaky TopControlsTest.testBasic

The test was getting the page height before the top controls were fully shown. Bug: 1020065, 1019948 Change-Id: Ide28825e5c4896421dc17fcc84e4da6714f25364 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1893516Reviewed-by: Scott Violet <sky@chromium.org> Commit-Queue: Clark DuVall <cduvall@chromium.org> Cr-Commit-Position: refs/heads/master@{#711377}

[WebLayer] Fix flaky TopControlsTest.testBasic
The test was getting the page height before the top controls were fully shown. Bug: 1020065, 1019948 Change-Id: Ide28825e5c4896421dc17fcc84e4da6714f25364 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1893516Reviewed-by: Scott Violet <sky@chromium.org> Commit-Queue: Clark DuVall <cduvall@chromium.org> Cr-Commit-Position: refs/heads/master@{#711377}
ee9db8c0 · Clark DuVall · Commit Bot · 5a847a2a · ee9db8c0
Commit ee9db8c0 authored Oct 31, 2019 by Clark DuVall Committed by Commit Bot Oct 31, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java ...tests/src/org/chromium/weblayer/test/TopControlsTest.java +8 -0

No files found.
--- a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java
+++ b/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java
@@ -81,6 +81,14 @@ public class TopControlsTest {
        final String url = UrlUtils.encodeHtmlDataUri("<body><p style='height:5000px'>");
        InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl(url);

+        // Wait for layout to make sure the top contents container is shown.
+        CallbackHelper helper = new CallbackHelper();
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            activity.getTopContentsContainer().getViewTreeObserver().addOnGlobalLayoutListener(
+                    helper::notifyCalled);
+        });
+        helper.waitForCallback(0);
+
        TestThreadUtils.runOnUiThreadBlocking(() -> {
            mTopControlsHeight = activity.getTopContentsContainer().getHeight();
            Assert.assertTrue(mTopControlsHeight > 0);