|
|
@ -44,6 +44,7 @@ import org.mozilla.fenix.R
|
|
|
|
import org.mozilla.fenix.ext.components
|
|
|
|
import org.mozilla.fenix.ext.components
|
|
|
|
import org.mozilla.fenix.helpers.Constants.LONG_CLICK_DURATION
|
|
|
|
import org.mozilla.fenix.helpers.Constants.LONG_CLICK_DURATION
|
|
|
|
import org.mozilla.fenix.helpers.Constants.RETRY_COUNT
|
|
|
|
import org.mozilla.fenix.helpers.Constants.RETRY_COUNT
|
|
|
|
|
|
|
|
import org.mozilla.fenix.helpers.MatcherHelper
|
|
|
|
import org.mozilla.fenix.helpers.SessionLoadedIdlingResource
|
|
|
|
import org.mozilla.fenix.helpers.SessionLoadedIdlingResource
|
|
|
|
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
|
|
|
|
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
|
|
|
|
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong
|
|
|
|
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong
|
|
|
@ -911,6 +912,8 @@ class BrowserRobot {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
|
|
|
|
fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
|
|
|
|
|
|
|
|
for (i in 1..RETRY_COUNT) {
|
|
|
|
|
|
|
|
try {
|
|
|
|
mDevice.waitForObjects(
|
|
|
|
mDevice.waitForObjects(
|
|
|
|
mDevice.findObject(
|
|
|
|
mDevice.findObject(
|
|
|
|
UiSelector()
|
|
|
|
UiSelector()
|
|
|
@ -920,14 +923,22 @@ class BrowserRobot {
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
tabsCounter().click()
|
|
|
|
tabsCounter().click()
|
|
|
|
|
|
|
|
assertTrue(
|
|
|
|
mDevice.waitForObjects(
|
|
|
|
MatcherHelper.itemWithResId("$packageName:id/new_tab_button")
|
|
|
|
mDevice.findObject(
|
|
|
|
.waitForExists(waitingTime),
|
|
|
|
UiSelector().resourceId("$packageName:id/new_tab_button"),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
waitingTime,
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
} catch (e: AssertionError) {
|
|
|
|
|
|
|
|
if (i == RETRY_COUNT) {
|
|
|
|
|
|
|
|
throw e
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
mDevice.waitForIdle()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
assertTrue(MatcherHelper.itemWithResId("$packageName:id/new_tab_button").waitForExists(waitingTime))
|
|
|
|
|
|
|
|
|
|
|
|
TabDrawerRobot().interact()
|
|
|
|
TabDrawerRobot().interact()
|
|
|
|
return TabDrawerRobot.Transition()
|
|
|
|
return TabDrawerRobot.Transition()
|
|
|
|
}
|
|
|
|
}
|
|
|
|