From e392b483b7e948c0705b8fa122a1c4e3ee8f2ba6 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Thu, 19 Mar 2015 23:39:59 +0100 Subject: [PATCH] Bug 1142699 - testReaderModeTitle: Wait for Gecko to be ready and reduce waiting time for reader mode to 30 seconds again. r=mcomella --- mobile/android/base/tests/components/ToolbarComponent.java | 7 +++---- mobile/android/base/tests/testReaderModeTitle.java | 3 +++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/tests/components/ToolbarComponent.java b/mobile/android/base/tests/components/ToolbarComponent.java index 91674bb2a344..73dee5e428a0 100644 --- a/mobile/android/base/tests/components/ToolbarComponent.java +++ b/mobile/android/base/tests/components/ToolbarComponent.java @@ -33,10 +33,9 @@ public class ToolbarComponent extends BaseComponent { private static final String URL_HTTP_PREFIX = "http://"; - // We are waiting up to 60 seconds instead of the default waiting time - // because reader mode parsing can take quite some time on slower devices - // See Bug 1142699 - private static final int READER_MODE_WAIT_MS = 60000; + // We are waiting up to 30 seconds instead of the default waiting time because reader mode + // parsing can take quite some time on slower devices (Bug 1142699) + private static final int READER_MODE_WAIT_MS = 30000; public ToolbarComponent(final UITestContext testContext) { super(testContext); diff --git a/mobile/android/base/tests/testReaderModeTitle.java b/mobile/android/base/tests/testReaderModeTitle.java index 1001ebe515de..0dfffd7f1c8e 100644 --- a/mobile/android/base/tests/testReaderModeTitle.java +++ b/mobile/android/base/tests/testReaderModeTitle.java @@ -1,5 +1,6 @@ package org.mozilla.gecko.tests; +import org.mozilla.gecko.tests.helpers.GeckoHelper; import org.mozilla.gecko.tests.helpers.NavigationHelper; /** @@ -7,6 +8,8 @@ import org.mozilla.gecko.tests.helpers.NavigationHelper; */ public class testReaderModeTitle extends UITest { public void testReaderModeTitle() { + GeckoHelper.blockForReady(); + NavigationHelper.enterAndLoadUrl(StringHelper.ROBOCOP_READER_MODE_BASIC_ARTICLE); mToolbar.pressReaderModeButton();