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

fenix/125.0
AndiAJ 3 months ago committed by mergify[bot]
parent 065f7e70fc
commit 77b69aafd7

@ -25,7 +25,7 @@ class SettingsSubMenuOpenLinksInAppsRobot {
fun verifyOpenLinksInAppsView(selectedOpenLinkInAppsOption: String) { fun verifyOpenLinksInAppsView(selectedOpenLinkInAppsOption: String) {
assertUIObjectExists( assertUIObjectExists(
goBackButton, goBackButton(),
itemContainingText(getStringResource(R.string.preferences_open_links_in_apps)), itemContainingText(getStringResource(R.string.preferences_open_links_in_apps)),
itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_always)), itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_always)),
itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_ask)), itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_ask)),
@ -36,7 +36,7 @@ class SettingsSubMenuOpenLinksInAppsRobot {
fun verifyPrivateOpenLinksInAppsView(selectedOpenLinkInAppsOption: String) { fun verifyPrivateOpenLinksInAppsView(selectedOpenLinkInAppsOption: String) {
assertUIObjectExists( assertUIObjectExists(
goBackButton, goBackButton(),
itemContainingText(getStringResource(R.string.preferences_open_links_in_apps)), itemContainingText(getStringResource(R.string.preferences_open_links_in_apps)),
itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_ask)), itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_ask)),
itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_never)), itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_never)),
@ -54,26 +54,26 @@ class SettingsSubMenuOpenLinksInAppsRobot {
fun clickOpenLinkInAppOption(openLinkInAppsOption: String) { fun clickOpenLinkInAppOption(openLinkInAppsOption: String) {
when (openLinkInAppsOption) { when (openLinkInAppsOption) {
"Always" -> alwaysOption.click() "Always" -> alwaysOption().click()
"Ask before opening" -> askBeforeOpeningOption.click() "Ask before opening" -> askBeforeOpeningOption().click()
"Never" -> neverOption.click() "Never" -> neverOption().click()
} }
} }
class Transition { class Transition {
fun goBack(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition { fun goBack(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition {
mDevice.waitForIdle() mDevice.waitForIdle()
goBackButton.click() goBackButton().click()
SettingsRobot().interact() SettingsRobot().interact()
return SettingsRobot.Transition() return SettingsRobot.Transition()
} }
} }
} }
private val goBackButton = itemWithDescription("Navigate up") private fun goBackButton() = itemWithDescription("Navigate up")
private val alwaysOption = private fun alwaysOption() =
itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_always)) itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_always))
private val askBeforeOpeningOption = private fun askBeforeOpeningOption() =
itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_ask)) itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_ask))
private val neverOption = private fun neverOption() =
itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_never)) itemContainingText(getStringResource(R.string.preferences_open_links_in_apps_never))

Loading…
Cancel
Save