Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

Various UI test fixes and disabling of intermittents

Browse Source
upstream-sync
Aaron Train 3 years ago committed by mergify[bot]
parent cd61ef1c1d
commit 87e4a250f1
10 changed files with 102 additions and 59 deletions
Show Stats Download Patch File Download Diff File

1
app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt
Unescape Escape View File

@ -212,6 +212,7 @@ class CollectionTest {
}.openTabDrawer {
}.openNewTab {
}.submitQuery(secondWebPage.url.toString()) {
mDevice.waitForIdle()
}.openTabDrawer {
longClickTab(firstWebPage.title)
verifyTabsMultiSelectionCounter(1)

1
app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
Unescape Escape View File

@ -225,6 +225,7 @@ class HistoryTest {
}.openTabDrawer {
}.openNewTab {
}.submitQuery(secondWebPage.url.toString()) {
mDevice.waitForIdle()
}.openThreeDotMenu {
}.openHistory {
verifyHistoryListExists()

1
app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
Unescape Escape View File

@ -52,6 +52,7 @@ class SearchTest {
}
}
@Ignore("Currently failing at assertSearchEngineResults, will need a re-check")
@Test
fun shortcutButtonTest() {
homeScreen {

2
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
Unescape Escape View File

@ -190,6 +190,7 @@ class SettingsPrivacyTest {
}
}
@Ignore("Disabled for failing with new Compose Awesomebar")
@Test
fun saveLoginFromPromptTest() {
val saveLoginTest =
@ -269,6 +270,7 @@ class SettingsPrivacyTest {
}
}
@Ignore("Disabled for failing with new Compose Awesomebar")
@Test
fun openExternalLinksInPrivateTest() {
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)

2
app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
Unescape Escape View File

@ -544,6 +544,7 @@ class SmokeTest {
}
}
@Ignore("Disabled for failing with new Compose Awesomebar")
@Test
// Test running on beta/release builds in CI:
// caution when making changes to it, so they don't block the builds
@ -583,6 +584,7 @@ class SmokeTest {
}
}
@Ignore("Will need to check other solutions to properly swipe")
@Test
// Swipes the nav bar left/right to switch between tabs
fun swipeToSwitchTabTest() {

31
app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
Unescape Escape View File

@ -38,7 +38,6 @@ import mozilla.components.browser.state.store.BrowserStore
import mozilla.components.concept.engine.mediasession.MediaSession
import org.hamcrest.CoreMatchers.allOf
import org.hamcrest.CoreMatchers.containsString
import org.hamcrest.Matchers.not
import org.junit.Assert.assertTrue
import org.junit.Assert.fail
import org.mozilla.fenix.R
@ -451,10 +450,10 @@ class BrowserRobot {
fun swipeNavBarRight(tabUrl: String) {
// failing to swipe on Firebase sometimes, so it tries again
try {
navURLBar().perform(ViewActions.swipeRight())
navURLBar().swipeRight(3)
assertTrue(mDevice.findObject(UiSelector().text(tabUrl)).waitUntilGone(waitingTime))
} catch (e: AssertionError) {
navURLBar().perform(ViewActions.swipeRight())
navURLBar().swipeRight(3)
assertTrue(mDevice.findObject(UiSelector().text(tabUrl)).waitUntilGone(waitingTime))
}
}
@ -462,10 +461,10 @@ class BrowserRobot {
fun swipeNavBarLeft(tabUrl: String) {
// failing to swipe on Firebase sometimes, so it tries again
try {
navURLBar().perform(ViewActions.swipeLeft())
navURLBar().swipeRight(3)
assertTrue(mDevice.findObject(UiSelector().text(tabUrl)).waitUntilGone(waitingTime))
} catch (e: AssertionError) {
navURLBar().perform(ViewActions.swipeLeft())
navURLBar().swipeRight(3)
assertTrue(mDevice.findObject(UiSelector().text(tabUrl)).waitUntilGone(waitingTime))
}
}
@ -489,7 +488,8 @@ class BrowserRobot {
}
fun openNavigationToolbar(interact: NavigationToolbarRobot.() -> Unit): NavigationToolbarRobot.Transition {
mDevice.waitForIdle(waitingTime)
mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
.waitForExists(waitingTime)
navURLBar().click()
NavigationToolbarRobot().interact()
@ -498,6 +498,11 @@ class BrowserRobot {
fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
mDevice.waitForIdle(waitingTime)
mDevice.findObject(
UiSelector()
.resourceId("$packageName:id/counter_box")
.descriptionContains("The tab counter toolbar button.")
).waitForExists(waitingTime)
tabsCounter().click()
mDevice.waitNotNull(
Until.findObject(By.res("$packageName:id/tab_layout")),
@ -511,9 +516,7 @@ class BrowserRobot {
fun openTabButtonShortcutsMenu(interact: NavigationToolbarRobot.() -> Unit): NavigationToolbarRobot.Transition {
mDevice.waitForIdle(waitingTime)
tabsCounter().perform(
ViewActions.longClick()
)
tabsCounter().click(LONG_CLICK_DURATION)
NavigationToolbarRobot().interact()
return NavigationToolbarRobot.Transition()
@ -563,13 +566,11 @@ fun browserScreen(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
return BrowserRobot.Transition()
}
fun navURLBar() = onView(withId(R.id.toolbar))
fun navURLBar() = mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
private fun assertNavURLBar() = navURLBar()
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
private fun assertNavURLBar() = assertTrue(navURLBar().waitForExists(waitingTime))
private fun assertNavURLBarHidden() = navURLBar()
.check(matches(not(isDisplayed())))
private fun assertNavURLBarHidden() = assertTrue(navURLBar().waitUntilGone(waitingTime))
private fun assertEnhancedTrackingProtectionSwitch() {
withText(R.id.trackingProtectionSwitch)
@ -593,7 +594,7 @@ private fun assertMenuButton() {
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
}
private fun tabsCounter() = onView(withId(R.id.counter_box))
private fun tabsCounter() = mDevice.findObject(By.res("$packageName:id/counter_box"))
private fun mediaPlayerPlayButton() =
mDevice.findObject(

9
app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
Unescape Escape View File

@ -180,7 +180,7 @@ class HomeScreenRobot {
fun openSearch(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
.waitForExists(waitingTime)
navigationToolbar().perform(click())
navigationToolbar().click()
SearchRobot().interact()
return SearchRobot.Transition()
@ -229,7 +229,7 @@ class HomeScreenRobot {
fun openNavigationToolbar(interact: NavigationToolbarRobot.() -> Unit): NavigationToolbarRobot.Transition {
mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
.waitForExists(waitingTime)
navigationToolbar().perform(click())
navigationToolbar().click()
NavigationToolbarRobot().interact()
return NavigationToolbarRobot.Transition()
@ -344,10 +344,9 @@ private fun assertKeyboardVisibility(isExpectedToBeVisible: Boolean) =
.contains("mInputShown=true")
)
private fun navigationToolbar() = onView(withId(R.id.toolbar))
private fun navigationToolbar() = mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
private fun assertNavigationToolbar() =
navigationToolbar().check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
private fun assertNavigationToolbar() = assertTrue(navigationToolbar().waitForExists(waitingTime))
private fun assertFocusedNavigationToolbar() =
onView(allOf(withHint("Search or enter address")))

33
app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
Unescape Escape View File

@ -12,9 +12,6 @@ import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.IdlingRegistry
import androidx.test.espresso.IdlingResource
import androidx.test.espresso.action.ViewActions
import androidx.test.espresso.action.ViewActions.pressImeActionButton
import androidx.test.espresso.action.ViewActions.replaceText
import androidx.test.espresso.action.ViewActions.typeText
import androidx.test.espresso.assertion.ViewAssertions
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.contrib.RecyclerViewActions
@ -33,8 +30,8 @@ import androidx.test.uiautomator.UiSelector
import androidx.test.uiautomator.Until
import org.hamcrest.CoreMatchers.allOf
import org.hamcrest.CoreMatchers.anyOf
import org.hamcrest.CoreMatchers.containsString
import org.hamcrest.CoreMatchers.not
import org.junit.Assert.assertTrue
import org.mozilla.fenix.R
import org.mozilla.fenix.helpers.SessionLoadedIdlingResource
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
@ -57,7 +54,7 @@ class NavigationToolbarRobot {
fun verifyCloseReaderViewDetected(visible: Boolean = false) =
assertCloseReaderViewDetected(visible)
fun typeSearchTerm(searchTerm: String) = awesomeBar().perform(typeText(searchTerm))
fun typeSearchTerm(searchTerm: String) = awesomeBar().setText(searchTerm)
fun toggleReaderView() {
mDevice.findObject(
@ -77,7 +74,14 @@ class NavigationToolbarRobot {
fun goBackToWebsite(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
openEditURLView()
clearAddressBar().click()
awesomeBar().check((matches(withText(containsString("")))))
assertTrue(
mDevice.findObject(
UiSelector()
.resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view")
.textContains("")
).waitForExists(waitingTime)
)
goBackButton()
BrowserRobot().interact()
@ -92,7 +96,8 @@ class NavigationToolbarRobot {
openEditURLView()
awesomeBar().perform(replaceText(url.toString()), pressImeActionButton())
awesomeBar().setText(url.toString())
mDevice.pressEnter()
runWithIdleRes(sessionLoadedIdlingResource) {
onView(
@ -114,7 +119,8 @@ class NavigationToolbarRobot {
openEditURLView()
awesomeBar().perform(replaceText(crashUrl), pressImeActionButton())
awesomeBar().setText(crashUrl)
mDevice.pressEnter()
runWithIdleRes(sessionLoadedIdlingResource) {
mDevice.findObject(UiSelector().resourceId("$packageName:id/crash_tab_image"))
@ -151,7 +157,8 @@ class NavigationToolbarRobot {
sessionLoadedIdlingResource = SessionLoadedIdlingResource()
mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/toolbar")), waitingTime)
urlBar().click()
awesomeBar().perform(replaceText(url.toString()), pressImeActionButton())
awesomeBar().setText(url.toString())
mDevice.pressEnter()
runWithIdleRes(sessionLoadedIdlingResource) {
onView(ViewMatchers.withResourceName("browserLayout"))
@ -286,12 +293,14 @@ private fun assertTabButtonShortcutMenuItems() {
.check(matches(hasDescendant(withText("New tab"))))
}
private fun urlBar() = onView(withId(R.id.toolbar))
private fun awesomeBar() = onView(withId(R.id.mozac_browser_toolbar_edit_url_view))
private fun urlBar() = mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))
private fun awesomeBar() =
mDevice.findObject(UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view"))
private fun threeDotButton() = onView(withId(R.id.mozac_browser_toolbar_menu))
private fun tabTrayButton() = onView(withId(R.id.tab_button))
private fun fillLinkButton() = onView(withId(R.id.fill_link_from_clipboard))
private fun clearAddressBar() = onView(withId(R.id.mozac_browser_toolbar_clear_view))
private fun clearAddressBar() =
mDevice.findObject(UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_clear_view"))
private fun goBackButton() = mDevice.pressBack()
private fun readerViewToggle() =
onView(withParent(withId(R.id.mozac_browser_toolbar_page_actions)))

77
app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
Unescape Escape View File

@ -21,10 +21,8 @@ import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.ViewInteraction
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
import androidx.test.espresso.action.ViewActions.typeText
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers
import androidx.test.espresso.matcher.ViewMatchers.Visibility
import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
import androidx.test.espresso.matcher.ViewMatchers.withId
@ -38,8 +36,8 @@ import androidx.test.uiautomator.UiSelector
import androidx.test.uiautomator.Until
import org.hamcrest.CoreMatchers.allOf
import org.hamcrest.CoreMatchers.startsWith
import org.hamcrest.Matchers
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.mozilla.fenix.R
import org.mozilla.fenix.helpers.Constants.LONG_CLICK_DURATION
import org.mozilla.fenix.helpers.SessionLoadedIdlingResource
@ -99,7 +97,7 @@ class SearchRobot {
}
fun typeSearch(searchTerm: String) {
browserToolbarEditView().perform(typeText(searchTerm))
browserToolbarEditView().setText(searchTerm)
}
fun clickSearchEngineButton(rule: ComposeTestRule, searchEngineName: String) {
@ -144,7 +142,7 @@ class SearchRobot {
}
fun clickClearButton() {
clearButton().perform(click())
clearButton().click()
}
fun longClickToolbar() {
@ -178,7 +176,8 @@ class SearchRobot {
fun openBrowser(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
mDevice.waitForIdle()
browserToolbarEditView().perform(typeText("mozilla\n"))
browserToolbarEditView().setText("mozilla\n")
mDevice.pressEnter()
BrowserRobot().interact()
return BrowserRobot.Transition()
@ -187,11 +186,15 @@ class SearchRobot {
fun submitQuery(query: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
sessionLoadedIdlingResource = SessionLoadedIdlingResource()
mDevice.waitForIdle()
browserToolbarEditView().perform(typeText(query + "\n"))
browserToolbarEditView().setText(query)
mDevice.pressEnter()
runWithIdleRes(sessionLoadedIdlingResource) {
onView(ViewMatchers.withResourceName("browserLayout"))
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
assertTrue(
mDevice.findObject(
UiSelector().resourceId("$packageName:id/browserLayout")
).waitForExists(waitingTime)
)
}
BrowserRobot().interact()
@ -206,7 +209,7 @@ class SearchRobot {
}
private fun browserToolbarEditView() =
onView(Matchers.allOf(withId(R.id.mozac_browser_toolbar_edit_url_view)))
mDevice.findObject(UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view"))
private fun denyPermissionButton(): UiObject {
mDevice.waitNotNull(Until.findObjects(By.text("Deny")), TestAssetHelper.waitingTime)
@ -223,7 +226,8 @@ private fun scanButton(): ViewInteraction {
return onView(allOf(withId(R.id.qr_scan_button)))
}
private fun clearButton() = onView(withId(R.id.mozac_browser_toolbar_clear_view))
private fun clearButton() =
mDevice.findObject(UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_clear_view"))
private fun searchWrapper() = onView(withId(R.id.search_wrapper))
@ -241,21 +245,33 @@ private fun assertSearchEngineResults(rule: ComposeTestRule, searchEngineName: S
.assertCountEquals(count)
}
private fun assertSearchView() {
onView(withId(R.id.search_wrapper)).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
}
private fun assertSearchView() =
assertTrue(
mDevice.findObject(
UiSelector().resourceId("$packageName:id/search_wrapper")
).waitForExists(waitingTime)
)
private fun assertBrowserToolbarEditView() =
onView(Matchers.allOf(withId(R.id.mozac_browser_toolbar_edit_url_view)))
.check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
assertTrue(
mDevice.findObject(
UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view")
).waitForExists(waitingTime)
)
private fun assertScanButton() =
onView(allOf(withText("Scan")))
.check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
assertTrue(
mDevice.findObject(
UiSelector().resourceId("$packageName:id/qr_scan_button")
).waitForExists(waitingTime)
)
private fun assertSearchEngineButton() =
onView(withId(R.id.search_engines_shortcut_button))
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
assertTrue(
mDevice.findObject(
UiSelector().resourceId("$packageName:id/search_engines_shortcut_button")
).waitForExists(waitingTime)
)
private fun assertSearchWithText() =
onView(allOf(withText("THIS TIME, SEARCH WITH:")))
@ -265,7 +281,14 @@ private fun assertSearchSettings() =
onView(allOf(withText("Default search engine")))
.check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
private fun assertSearchBarEmpty() = browserToolbarEditView().check(matches(withText("")))
private fun assertSearchBarEmpty() =
assertTrue(
mDevice.findObject(
UiSelector()
.resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view")
.textContains("")
).waitForExists(waitingTime)
)
fun searchScreen(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
SearchRobot().interact()
@ -337,10 +360,14 @@ private fun ComposeTestRule.selectDefaultSearchEngine(searchEngine: String) {
.performClick()
}
private fun assertDefaultSearchEngine(expectedText: String) {
onView(allOf(withId(R.id.mozac_browser_toolbar_edit_icon), withContentDescription(expectedText)))
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
}
private fun assertDefaultSearchEngine(expectedText: String) =
assertTrue(
mDevice.findObject(
UiSelector()
.resourceId("$packageName:id/mozac_browser_toolbar_edit_icon")
.descriptionContains(expectedText)
).waitForExists(waitingTime)
)
private fun assertPastedToolbarText(expectedText: String) {
mDevice.findObject(UiSelector().resourceId("$packageName:id/toolbar"))

4
app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
Unescape Escape View File

@ -252,7 +252,7 @@ class TabDrawerRobot {
fun openNewTab(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
mDevice.waitForIdle()
newTabButton().perform(click())
newTabButton().click()
SearchRobot().interact()
return SearchRobot.Transition()
}
@ -392,7 +392,7 @@ private fun normalBrowsingButton() = onView(
)
private fun privateBrowsingButton() = onView(withContentDescription("Private tabs"))
private fun newTabButton() = onView(withId(R.id.new_tab_button))
private fun newTabButton() = mDevice.findObject(UiSelector().resourceId("$packageName:id/new_tab_button"))
private fun threeDotMenu() = onView(withId(R.id.tab_tray_overflow))
private fun assertExistingOpenTabs(title: String) {

Write Preview
Loading…
Cancel
Save