Bug 1881010 - Remove redundant assertion functions from SettingsSubMenuDeleteBrowsingDataRobot

fenix/125.0
AndiAJ 3 months ago committed by mergify[bot]
parent 039c1238a8
commit 0ea68ff9fc

@ -29,15 +29,22 @@ import org.mozilla.fenix.helpers.click
*/ */
class SettingsSubMenuDeleteBrowsingDataRobot { class SettingsSubMenuDeleteBrowsingDataRobot {
fun verifyAllCheckBoxesAreChecked() = assertAllCheckBoxesAreChecked() fun verifyAllCheckBoxesAreChecked() {
fun verifyOpenTabsCheckBox(status: Boolean) = assertOpenTabsCheckBox(status) openTabsCheckBox().assertIsChecked(true)
fun verifyBrowsingHistoryDetails(status: Boolean) = assertBrowsingHistoryCheckBox(status) browsingHistoryCheckBox().assertIsChecked(true)
fun verifyCookiesCheckBox(status: Boolean) = assertCookiesCheckBox(status) cookiesAndSiteDataCheckBox().assertIsChecked(true)
fun verifyCachedFilesCheckBox(status: Boolean) = assertCachedFilesCheckBox(status) cachedFilesCheckBox().assertIsChecked(true)
fun verifySitePermissionsCheckBox(status: Boolean) = assertSitePermissionsCheckBox(status) sitePermissionsCheckBox().assertIsChecked(true)
fun verifyDownloadsCheckBox(status: Boolean) = assertDownloadsCheckBox(status) downloadsCheckBox().assertIsChecked(true)
fun verifyOpenTabsDetails(tabNumber: String) = assertOpenTabsDescription(tabNumber) }
fun verifyBrowsingHistoryDetails(addresses: String) = assertBrowsingHistoryDescription(addresses) fun verifyOpenTabsCheckBox(status: Boolean) = openTabsCheckBox().assertIsChecked(status)
fun verifyBrowsingHistoryDetails(status: Boolean) = browsingHistoryCheckBox().assertIsChecked(status)
fun verifyCookiesCheckBox(status: Boolean) = cookiesAndSiteDataCheckBox().assertIsChecked(status)
fun verifyCachedFilesCheckBox(status: Boolean) = cachedFilesCheckBox().assertIsChecked(status)
fun verifySitePermissionsCheckBox(status: Boolean) = sitePermissionsCheckBox().assertIsChecked(status)
fun verifyDownloadsCheckBox(status: Boolean) = downloadsCheckBox().assertIsChecked(status)
fun verifyOpenTabsDetails(tabNumber: String) = openTabsDescription(tabNumber).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
fun verifyBrowsingHistoryDetails(addresses: String) = assertUIObjectExists(browsingHistoryDescription(addresses))
fun verifyDeleteBrowsingDataDialog() { fun verifyDeleteBrowsingDataDialog() {
dialogMessage().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) dialogMessage().check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
@ -56,78 +63,78 @@ class SettingsSubMenuDeleteBrowsingDataRobot {
fun selectOnlyOpenTabsCheckBox() { fun selectOnlyOpenTabsCheckBox() {
clickBrowsingHistoryCheckBox() clickBrowsingHistoryCheckBox()
assertBrowsingHistoryCheckBox(false) browsingHistoryCheckBox().assertIsChecked(false)
clickCookiesCheckBox() clickCookiesCheckBox()
assertCookiesCheckBox(false) cookiesAndSiteDataCheckBox().assertIsChecked(false)
clickCachedFilesCheckBox() clickCachedFilesCheckBox()
assertCachedFilesCheckBox(false) cachedFilesCheckBox().assertIsChecked(false)
clickSitePermissionsCheckBox() clickSitePermissionsCheckBox()
assertSitePermissionsCheckBox(false) sitePermissionsCheckBox().assertIsChecked(false)
clickDownloadsCheckBox() clickDownloadsCheckBox()
assertDownloadsCheckBox(false) downloadsCheckBox().assertIsChecked(false)
assertOpenTabsCheckBox(true) openTabsCheckBox().assertIsChecked(true)
} }
fun selectOnlyBrowsingHistoryCheckBox() { fun selectOnlyBrowsingHistoryCheckBox() {
clickOpenTabsCheckBox() clickOpenTabsCheckBox()
assertOpenTabsCheckBox(false) openTabsCheckBox().assertIsChecked(false)
clickCookiesCheckBox() clickCookiesCheckBox()
assertCookiesCheckBox(false) cookiesAndSiteDataCheckBox().assertIsChecked(false)
clickCachedFilesCheckBox() clickCachedFilesCheckBox()
assertCachedFilesCheckBox(false) cachedFilesCheckBox().assertIsChecked(false)
clickSitePermissionsCheckBox() clickSitePermissionsCheckBox()
assertSitePermissionsCheckBox(false) sitePermissionsCheckBox().assertIsChecked(false)
clickDownloadsCheckBox() clickDownloadsCheckBox()
assertDownloadsCheckBox(false) downloadsCheckBox().assertIsChecked(false)
assertBrowsingHistoryCheckBox(true) browsingHistoryCheckBox().assertIsChecked(true)
} }
fun selectOnlyCookiesCheckBox() { fun selectOnlyCookiesCheckBox() {
clickOpenTabsCheckBox() clickOpenTabsCheckBox()
assertOpenTabsCheckBox(false) openTabsCheckBox().assertIsChecked(false)
assertCookiesCheckBox(true) cookiesAndSiteDataCheckBox().assertIsChecked(true)
clickCachedFilesCheckBox() clickCachedFilesCheckBox()
assertCachedFilesCheckBox(false) cachedFilesCheckBox().assertIsChecked(false)
clickSitePermissionsCheckBox() clickSitePermissionsCheckBox()
assertSitePermissionsCheckBox(false) sitePermissionsCheckBox().assertIsChecked(false)
clickDownloadsCheckBox() clickDownloadsCheckBox()
assertDownloadsCheckBox(false) downloadsCheckBox().assertIsChecked(false)
clickBrowsingHistoryCheckBox() clickBrowsingHistoryCheckBox()
assertBrowsingHistoryCheckBox(false) browsingHistoryCheckBox().assertIsChecked(false)
} }
fun selectOnlyCachedFilesCheckBox() { fun selectOnlyCachedFilesCheckBox() {
clickOpenTabsCheckBox() clickOpenTabsCheckBox()
assertOpenTabsCheckBox(false) openTabsCheckBox().assertIsChecked(false)
clickBrowsingHistoryCheckBox() clickBrowsingHistoryCheckBox()
assertBrowsingHistoryCheckBox(false) browsingHistoryCheckBox().assertIsChecked(false)
clickCookiesCheckBox() clickCookiesCheckBox()
assertCookiesCheckBox(false) cookiesAndSiteDataCheckBox().assertIsChecked(false)
assertCachedFilesCheckBox(true) cachedFilesCheckBox().assertIsChecked(true)
clickSitePermissionsCheckBox() clickSitePermissionsCheckBox()
assertSitePermissionsCheckBox(false) sitePermissionsCheckBox().assertIsChecked(false)
clickDownloadsCheckBox() clickDownloadsCheckBox()
assertDownloadsCheckBox(false) downloadsCheckBox().assertIsChecked(false)
} }
fun confirmDeletionAndAssertSnackbar() { fun confirmDeletionAndAssertSnackbar() {
@ -179,32 +186,10 @@ private fun dialogMessage() =
onView(withText("$appName will delete the selected browsing data.")) onView(withText("$appName will delete the selected browsing data."))
.inRoot(isDialog()) .inRoot(isDialog())
private fun assertAllCheckBoxesAreChecked() {
openTabsCheckBox().assertIsChecked(true)
browsingHistoryCheckBox().assertIsChecked(true)
cookiesAndSiteDataCheckBox().assertIsChecked(true)
cachedFilesCheckBox().assertIsChecked(true)
sitePermissionsCheckBox().assertIsChecked(true)
downloadsCheckBox().assertIsChecked(true)
}
private fun assertOpenTabsDescription(tabNumber: String) =
openTabsDescription(tabNumber).check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
private fun assertBrowsingHistoryDescription(addresses: String) =
assertUIObjectExists(browsingHistoryDescription(addresses))
private fun assertDeleteBrowsingDataSnackbar() = assertUIObjectIsGone(itemWithText("Browsing data deleted")) private fun assertDeleteBrowsingDataSnackbar() = assertUIObjectIsGone(itemWithText("Browsing data deleted"))
private fun clickOpenTabsCheckBox() = openTabsCheckBox().click() private fun clickOpenTabsCheckBox() = openTabsCheckBox().click()
private fun assertOpenTabsCheckBox(status: Boolean) = openTabsCheckBox().assertIsChecked(status)
private fun clickBrowsingHistoryCheckBox() = browsingHistoryCheckBox().click() private fun clickBrowsingHistoryCheckBox() = browsingHistoryCheckBox().click()
private fun assertBrowsingHistoryCheckBox(status: Boolean) = browsingHistoryCheckBox().assertIsChecked(status)
private fun clickCookiesCheckBox() = cookiesAndSiteDataCheckBox().click() private fun clickCookiesCheckBox() = cookiesAndSiteDataCheckBox().click()
private fun assertCookiesCheckBox(status: Boolean) = cookiesAndSiteDataCheckBox().assertIsChecked(status)
private fun clickCachedFilesCheckBox() = cachedFilesCheckBox().click() private fun clickCachedFilesCheckBox() = cachedFilesCheckBox().click()
private fun assertCachedFilesCheckBox(status: Boolean) = cachedFilesCheckBox().assertIsChecked(status)
private fun clickSitePermissionsCheckBox() = sitePermissionsCheckBox().click() private fun clickSitePermissionsCheckBox() = sitePermissionsCheckBox().click()
private fun assertSitePermissionsCheckBox(status: Boolean) = sitePermissionsCheckBox().assertIsChecked(status)
private fun clickDownloadsCheckBox() = downloadsCheckBox().click() private fun clickDownloadsCheckBox() = downloadsCheckBox().click()
private fun assertDownloadsCheckBox(status: Boolean) = downloadsCheckBox().assertIsChecked(status)

Loading…
Cancel
Save