Bug 1881250 - Convert private variables to functions so they don't get initialised

fenix/125.0
AndiAJ 4 months ago committed by mergify[bot]
parent 878676dd98
commit 875e7ac399

@ -21,8 +21,8 @@ import org.mozilla.fenix.helpers.click
class SettingsSubMenuLanguageRobot { class SettingsSubMenuLanguageRobot {
fun selectLanguage(language: String) { fun selectLanguage(language: String) {
languagesList.waitForExists(waitingTime) languagesList().waitForExists(waitingTime)
languagesList languagesList()
.getChildByText(UiSelector().text(language), language) .getChildByText(UiSelector().text(language), language)
.click() .click()
} }
@ -35,9 +35,9 @@ class SettingsSubMenuLanguageRobot {
fun verifyLanguageHeaderIsTranslated(translation: String) = assertUIObjectExists(itemWithText(translation)) fun verifyLanguageHeaderIsTranslated(translation: String) = assertUIObjectExists(itemWithText(translation))
fun verifySelectedLanguage(language: String) { fun verifySelectedLanguage(language: String) {
languagesList.waitForExists(waitingTime) languagesList().waitForExists(waitingTime)
assertUIObjectExists( assertUIObjectExists(
languagesList languagesList()
.getChildByText(UiSelector().text(language), language, true) .getChildByText(UiSelector().text(language), language, true)
.getFromParent(UiSelector().resourceId("$packageName:id/locale_selected_icon")), .getFromParent(UiSelector().resourceId("$packageName:id/locale_selected_icon")),
) )
@ -48,8 +48,8 @@ class SettingsSubMenuLanguageRobot {
} }
fun typeInSearchBar(text: String) { fun typeInSearchBar(text: String) {
searchBar.waitForExists(waitingTime) searchBar().waitForExists(waitingTime)
searchBar.text = text searchBar().text = text
} }
fun verifySearchResultsContains(languageName: String) = fun verifySearchResultsContains(languageName: String) =
@ -59,7 +59,7 @@ class SettingsSubMenuLanguageRobot {
onView(withId(R.id.search_close_btn)).click() onView(withId(R.id.search_close_btn)).click()
} }
fun verifyLanguageListIsDisplayed() = assertUIObjectExists(languagesList) fun verifyLanguageListIsDisplayed() = assertUIObjectExists(languagesList())
class Transition { class Transition {
@ -76,7 +76,7 @@ class SettingsSubMenuLanguageRobot {
private fun goBackButton() = private fun goBackButton() =
onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up"))) onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up")))
private val languagesList = private fun languagesList() =
UiScrollable( UiScrollable(
UiSelector() UiSelector()
.resourceId("$packageName:id/locale_list") .resourceId("$packageName:id/locale_list")
@ -85,5 +85,5 @@ private val languagesList =
private fun language(name: String) = mDevice.findObject(UiSelector().text(name)) private fun language(name: String) = mDevice.findObject(UiSelector().text(name))
private val searchBar = private fun searchBar() =
mDevice.findObject(UiSelector().resourceId("$packageName:id/search_src_text")) mDevice.findObject(UiSelector().resourceId("$packageName:id/search_src_text"))

Loading…
Cancel
Save