Skip to content
This repository was archived by the owner on Jun 17, 2024. It is now read-only.

Commit 5f2279e

Browse files
AndiAJAndiAJ
committed
x
1 parent 926bed9 commit 5f2279e

15 files changed

+12
-30
lines changed

‎fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt

+3-8
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import org.junit.Assert.assertFalse
3434
import org.junit.Assert.assertTrue
3535
import org.mozilla.fenix.R
3636
import org.mozilla.fenix.helpers.Constants.TAG
37+
import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
38+
import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
3739
import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText
3840
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
3941
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
@@ -103,14 +105,7 @@ object TestHelper {
103105
).waitUntilGone(waitingTime)
104106
}
105107

106-
fun verifySnackBarText(expectedText: String) {
107-
assertTrue(
108-
mDevice.findObject(
109-
UiSelector()
110-
.textContains(expectedText),
111-
).waitForExists(waitingTime),
112-
)
113-
}
108+
fun verifySnackBarText(expectedText: String) = assertUIObjectExists(itemContainingText(expectedText))
114109

115110
fun verifyUrl(urlSubstring: String, resourceName: String, resId: Int) {
116111
waitUntilObjectIsFound(resourceName)

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import org.mozilla.fenix.helpers.TestHelper.appContext
3232
import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
3333
import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
3434
import org.mozilla.fenix.helpers.TestHelper.restartApp
35+
import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
3536
import org.mozilla.fenix.ui.robots.bookmarksMenu
3637
import org.mozilla.fenix.ui.robots.browserScreen
3738
import org.mozilla.fenix.ui.robots.homeScreen

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
1818
import org.mozilla.fenix.helpers.TestAssetHelper
1919
import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
2020
import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
21+
import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
2122
import org.mozilla.fenix.ui.robots.browserScreen
2223
import org.mozilla.fenix.ui.robots.collectionRobot
2324
import org.mozilla.fenix.ui.robots.homeScreen

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeContextMenusTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
2323
import org.mozilla.fenix.helpers.RetryTestRule
2424
import org.mozilla.fenix.helpers.TestAssetHelper
2525
import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
26+
import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
2627
import org.mozilla.fenix.ui.robots.clickContextMenuItem
2728
import org.mozilla.fenix.ui.robots.clickPageObject
2829
import org.mozilla.fenix.ui.robots.downloadRobot

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTopSitesTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
2020
import org.mozilla.fenix.helpers.HomeActivityTestRule
2121
import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
2222
import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
23+
import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
2324
import org.mozilla.fenix.helpers.TestHelper.waitUntilSnackbarGone
2425
import org.mozilla.fenix.ui.robots.browserScreen
2526
import org.mozilla.fenix.ui.robots.homeScreenWithComposeTopSites

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
2222
import org.mozilla.fenix.helpers.RetryTestRule
2323
import org.mozilla.fenix.helpers.TestAssetHelper
2424
import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
25+
import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
2526
import org.mozilla.fenix.ui.robots.clickContextMenuItem
2627
import org.mozilla.fenix.ui.robots.clickPageObject
2728
import org.mozilla.fenix.ui.robots.downloadRobot

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import org.mozilla.fenix.helpers.HomeActivityTestRule
2020
import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
2121
import org.mozilla.fenix.helpers.RetryTestRule
2222
import org.mozilla.fenix.helpers.TestAssetHelper
23+
import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
2324
import org.mozilla.fenix.ui.robots.browserScreen
2425
import org.mozilla.fenix.ui.robots.clickPageObject
2526
import org.mozilla.fenix.ui.robots.homeScreen

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import org.mozilla.fenix.helpers.RetryTestRule
1818
import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
1919
import org.mozilla.fenix.helpers.TestHelper.mDevice
2020
import org.mozilla.fenix.helpers.TestHelper.restartApp
21+
import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
2122
import org.mozilla.fenix.ui.robots.browserScreen
2223
import org.mozilla.fenix.ui.robots.homeScreen
2324
import org.mozilla.fenix.ui.robots.navigationToolbar

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import org.mozilla.fenix.helpers.RetryTestRule
2323
import org.mozilla.fenix.helpers.TestAssetHelper
2424
import org.mozilla.fenix.helpers.TestHelper.closeApp
2525
import org.mozilla.fenix.helpers.TestHelper.restartApp
26+
import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
2627
import org.mozilla.fenix.ui.robots.browserScreen
2728
import org.mozilla.fenix.ui.robots.clickPageObject
2829
import org.mozilla.fenix.ui.robots.homeScreen

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource
2020
import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
2121
import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
2222
import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
23+
import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
2324
import org.mozilla.fenix.helpers.TestHelper.waitUntilSnackbarGone
2425
import org.mozilla.fenix.ui.robots.browserScreen
2526
import org.mozilla.fenix.ui.robots.homeScreen

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt

-5
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@ class BrowserRobot {
163163
),
164164
)
165165

166-
fun verifySnackBarText(expectedText: String) {
167-
mDevice.waitForObjects(mDevice.findObject(UiSelector().textContains(expectedText)))
168-
assertUIObjectExists(itemContainingText(expectedText))
169-
}
170-
171166
fun verifyContextMenuForLocalHostLinks(containsURL: Uri) {
172167
// If the link is directing to another local asset the "Download link" option is not available
173168
// If the link is not re-directing to an external app the "Open link in external app" option is not available

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt

-3
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,6 @@ class CollectionRobot {
169169
Log.i(TAG, "swipeTabRight: Waited for rule to be idle")
170170
}
171171

172-
fun verifySnackBarText(expectedText: String) =
173-
itemContainingText(expectedText).waitForExists(waitingTime)
174-
175172
fun goBackInCollectionFlow() {
176173
backButton().click()
177174
Log.i(TAG, "goBackInCollectionFlow: Clicked collection creation flow back button")

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt

-4
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,6 @@ class HomeScreenRobot {
290290
fun swipeToTop() =
291291
onView(withId(R.id.sessionControlRecyclerView)).perform(ViewActions.swipeDown())
292292

293-
fun verifySnackBarText(expectedText: String) {
294-
mDevice.waitNotNull(findObject(By.text(expectedText)), waitingTime)
295-
}
296-
297293
fun clickFirefoxLogo() = homepageWordmark().click()
298294

299295
fun verifyThoughtProvokingStories(enabled: Boolean) {

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuHomepageRobot.kt

-7
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ import org.hamcrest.CoreMatchers.allOf
2323
import org.hamcrest.Matchers
2424
import org.mozilla.fenix.R
2525
import org.mozilla.fenix.helpers.Constants
26-
import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
27-
import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
2826
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
2927
import org.mozilla.fenix.helpers.TestHelper
3028
import org.mozilla.fenix.helpers.TestHelper.mDevice
@@ -101,11 +99,6 @@ class SettingsSubMenuHomepageRobot {
10199
fun selectWallpaper(wallpaperName: String) =
102100
mDevice.findObject(UiSelector().description(wallpaperName)).click()
103101

104-
fun verifySnackBarText(expectedText: String) =
105-
assertUIObjectExists(
106-
itemContainingText(expectedText),
107-
)
108-
109102
fun verifySponsoredShortcutsCheckBox(checked: Boolean) = assertSponsoredShortcutsCheckBox(checked)
110103

111104
class Transition {

‎fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt

-3
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,6 @@ class TabDrawerRobot {
206206
}
207207
}
208208

209-
fun verifySnackBarText(expectedText: String) =
210-
assertUIObjectExists(itemContainingText(expectedText))
211-
212209
fun snackBarButtonClick(expectedText: String) {
213210
val snackBarButton =
214211
mDevice.findObject(

0 commit comments

Comments
 (0)