pull/600/head
AndiAJ 2 years ago committed by mergify[bot]
parent 1e3024e560
commit 51044beb79

@ -14,7 +14,6 @@ import android.graphics.Canvas
import android.graphics.Color import android.graphics.Color
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.util.Log
import android.view.View import android.view.View
import androidx.browser.customtabs.CustomTabsIntent import androidx.browser.customtabs.CustomTabsIntent
import androidx.test.espresso.Espresso import androidx.test.espresso.Espresso
@ -37,7 +36,6 @@ import androidx.test.uiautomator.UiObjectNotFoundException
import androidx.test.uiautomator.UiScrollable import androidx.test.uiautomator.UiScrollable
import androidx.test.uiautomator.UiSelector import androidx.test.uiautomator.UiSelector
import androidx.test.uiautomator.Until import androidx.test.uiautomator.Until
import java.util.regex.Pattern
import junit.framework.AssertionFailedError import junit.framework.AssertionFailedError
import mozilla.components.browser.state.search.SearchEngine import mozilla.components.browser.state.search.SearchEngine
import mozilla.components.support.ktx.android.content.appName import mozilla.components.support.ktx.android.content.appName
@ -55,6 +53,7 @@ import org.mozilla.fenix.helpers.idlingresource.NetworkConnectionIdlingResource
import org.mozilla.fenix.ui.robots.BrowserRobot import org.mozilla.fenix.ui.robots.BrowserRobot
import org.mozilla.fenix.ui.robots.mDevice import org.mozilla.fenix.ui.robots.mDevice
import org.mozilla.fenix.utils.IntentUtils import org.mozilla.fenix.utils.IntentUtils
import java.util.regex.Pattern
object TestHelper { object TestHelper {
@ -229,12 +228,8 @@ object TestHelper {
fun assertNativeAppOpens(appPackageName: String, url: String) { fun assertNativeAppOpens(appPackageName: String, url: String) {
if (isPackageInstalled(appPackageName)) { if (isPackageInstalled(appPackageName)) {
try { mDevice.waitForIdle(waitingTimeShort)
intended(toPackage(appPackageName)) intended(toPackage(appPackageName))
} catch (e: AssertionFailedError) {
e.printStackTrace()
Log.e("TestLog", "intent to $appPackageName not sent or doesn't match")
}
} else { } else {
BrowserRobot().verifyUrl(url) BrowserRobot().verifyUrl(url)
} }

@ -62,6 +62,7 @@ class PwaTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(externalLinksPWAPage.toUri()) { }.enterURLAndEnterToBrowser(externalLinksPWAPage.toUri()) {
waitForPageToLoad()
}.openThreeDotMenu { }.openThreeDotMenu {
}.clickInstall { }.clickInstall {
clickAddAutomaticallyButton() clickAddAutomaticallyButton()
@ -77,6 +78,7 @@ class PwaTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(externalLinksPWAPage.toUri()) { }.enterURLAndEnterToBrowser(externalLinksPWAPage.toUri()) {
waitForPageToLoad()
}.openThreeDotMenu { }.openThreeDotMenu {
}.clickInstall { }.clickInstall {
clickAddAutomaticallyButton() clickAddAutomaticallyButton()

@ -43,6 +43,7 @@ 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.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.TestHelper.packageName import org.mozilla.fenix.helpers.TestHelper.packageName
import org.mozilla.fenix.helpers.TestHelper.waitForObjects import org.mozilla.fenix.helpers.TestHelper.waitForObjects
import org.mozilla.fenix.helpers.click import org.mozilla.fenix.helpers.click
@ -313,7 +314,7 @@ class BrowserRobot {
fun clickLinkMatchingText(expectedText: String) { fun clickLinkMatchingText(expectedText: String) {
mDevice.findObject(UiSelector().resourceId("$packageName:id/engineView")) mDevice.findObject(UiSelector().resourceId("$packageName:id/engineView"))
.waitForExists(waitingTime) .waitForExists(waitingTime)
mDevice.findObject(UiSelector().textContains(expectedText)).waitForExists(waitingTime) mDevice.findObject(UiSelector().textContains(expectedText)).waitForExists(waitingTimeLong)
val element = mDevice.findObject(UiSelector().textContains(expectedText)) val element = mDevice.findObject(UiSelector().textContains(expectedText))
element.click() element.click()

Loading…
Cancel
Save