Commit b1c3aadc authored by Lijin Shen's avatar Lijin Shen Committed by Commit Bot

Fix failure of promo dialog test on no illustration case

Increase height to fix failure.

Bug: 1131684
Change-Id: Ie4ff784d0c93ea095d8d4b8596ef4db4a198e6fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442470Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Lijin Shen <lazzzis@google.com>
Cr-Commit-Position: refs/heads/master@{#812921}
parent d062dc8c
...@@ -23,7 +23,6 @@ import org.junit.runner.RunWith; ...@@ -23,7 +23,6 @@ import org.junit.runner.RunWith;
import org.chromium.base.test.BaseJUnit4ClassRunner; import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.CallbackHelper;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.components.browser_ui.widget.PromoDialog.DialogParams; import org.chromium.components.browser_ui.widget.PromoDialog.DialogParams;
import org.chromium.components.browser_ui.widget.test.R; import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils;
...@@ -298,7 +297,6 @@ public class PromoDialogTest extends DummyUiActivityTestCase { ...@@ -298,7 +297,6 @@ public class PromoDialogTest extends DummyUiActivityTestCase {
@Test @Test
@SmallTest @SmallTest
@DisabledTest(message = "https://crbug.com/1131684")
public void testBasic_HeaderBehavior_NoIllustration() throws Exception { public void testBasic_HeaderBehavior_NoIllustration() throws Exception {
// Without an illustration, the header View becomes locked to the top of the layout if // Without an illustration, the header View becomes locked to the top of the layout if
// there is enough height. // there is enough height.
...@@ -318,7 +316,7 @@ public class PromoDialogTest extends DummyUiActivityTestCase { ...@@ -318,7 +316,7 @@ public class PromoDialogTest extends DummyUiActivityTestCase {
ViewGroup scrollableLayout = ViewGroup scrollableLayout =
(ViewGroup) promoDialogLayout.findViewById(R.id.scrollable_promo_content); (ViewGroup) promoDialogLayout.findViewById(R.id.scrollable_promo_content);
wrapper.triggerDialogLayoutMeasure(400, 1000); wrapper.triggerDialogLayoutMeasure(400, 2000);
Assert.assertEquals(promoDialogLayout.getChildAt(0), header); Assert.assertEquals(promoDialogLayout.getChildAt(0), header);
assertHasStartAndEndPadding(header, true); assertHasStartAndEndPadding(header, true);
...@@ -328,7 +326,7 @@ public class PromoDialogTest extends DummyUiActivityTestCase { ...@@ -328,7 +326,7 @@ public class PromoDialogTest extends DummyUiActivityTestCase {
assertHasStartAndEndPadding(header, false); assertHasStartAndEndPadding(header, false);
// Increase again and ensure the header is moved back to the top of the layout. // Increase again and ensure the header is moved back to the top of the layout.
wrapper.triggerDialogLayoutMeasure(400, 1000); wrapper.triggerDialogLayoutMeasure(400, 2000);
Assert.assertEquals(promoDialogLayout.getChildAt(0), header); Assert.assertEquals(promoDialogLayout.getChildAt(0), header);
assertHasStartAndEndPadding(header, true); assertHasStartAndEndPadding(header, true);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment