From 0bbeb07069426e3f238bd096fc3ce143e618fc58 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 1 Mar 2024 10:50:43 +0200
Subject: [PATCH] Bug 1882987 - Remove redundant assertion functions from
 SiteSecurityRobot

---
 .../fenix/ui/robots/SiteSecurityRobot.kt      | 55 ++++++++-----------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SiteSecurityRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SiteSecurityRobot.kt
index 2995189ce9..27acd40175 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SiteSecurityRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SiteSecurityRobot.kt
@@ -26,46 +26,39 @@ import org.mozilla.fenix.helpers.TestHelper.packageName
  */
 class SiteSecurityRobot {
 
-    fun verifyQuickActionSheet(url: String = "", isConnectionSecure: Boolean) = assertQuickActionSheet(url, isConnectionSecure)
+    fun verifyQuickActionSheet(url: String = "", isConnectionSecure: Boolean) {
+        quickActionSheet().waitForExists(waitingTime)
+        assertUIObjectExists(
+            quickActionSheetUrl(url.tryGetHostFromUrl()),
+            quickActionSheetSecurityInfo(isConnectionSecure),
+            quickActionSheetTrackingProtectionSwitch(),
+            quickActionSheetClearSiteData(),
+        )
+    }
     fun openSecureConnectionSubMenu(isConnectionSecure: Boolean) {
         quickActionSheetSecurityInfo(isConnectionSecure).click()
         mDevice.waitForWindowUpdate(packageName, waitingTimeShort)
     }
-    fun verifySecureConnectionSubMenu(pageTitle: String = "", url: String = "", isConnectionSecure: Boolean) =
-        assertSecureConnectionSubMenu(pageTitle, url, isConnectionSecure)
+    fun verifySecureConnectionSubMenu(pageTitle: String = "", url: String = "", isConnectionSecure: Boolean) {
+        secureConnectionSubMenu().waitForExists(waitingTime)
+        assertUIObjectExists(
+            secureConnectionSubMenuPageTitle(pageTitle),
+            secureConnectionSubMenuPageUrl(url),
+            secureConnectionSubMenuSecurityInfo(isConnectionSecure),
+            secureConnectionSubMenuLockIcon(),
+            secureConnectionSubMenuCertificateInfo(),
+        )
+    }
     fun clickQuickActionSheetClearSiteData() = quickActionSheetClearSiteData().click()
-    fun verifyClearSiteDataPrompt(url: String) = assertClearSiteDataPrompt(url)
+    fun verifyClearSiteDataPrompt(url: String) {
+        assertUIObjectExists(clearSiteDataPrompt(url))
+        cancelClearSiteDataButton.check(matches(isDisplayed()))
+        deleteSiteDataButton.check(matches(isDisplayed()))
+    }
 
     class Transition
 }
 
-private fun assertQuickActionSheet(url: String = "", isConnectionSecure: Boolean) {
-    quickActionSheet().waitForExists(waitingTime)
-    assertUIObjectExists(
-        quickActionSheetUrl(url.tryGetHostFromUrl()),
-        quickActionSheetSecurityInfo(isConnectionSecure),
-        quickActionSheetTrackingProtectionSwitch(),
-        quickActionSheetClearSiteData(),
-    )
-}
-
-private fun assertSecureConnectionSubMenu(pageTitle: String = "", url: String = "", isConnectionSecure: Boolean) {
-    secureConnectionSubMenu().waitForExists(waitingTime)
-    assertUIObjectExists(
-        secureConnectionSubMenuPageTitle(pageTitle),
-        secureConnectionSubMenuPageUrl(url),
-        secureConnectionSubMenuSecurityInfo(isConnectionSecure),
-        secureConnectionSubMenuLockIcon(),
-        secureConnectionSubMenuCertificateInfo(),
-    )
-}
-
-private fun assertClearSiteDataPrompt(url: String) {
-    assertUIObjectExists(clearSiteDataPrompt(url))
-    cancelClearSiteDataButton.check(matches(isDisplayed()))
-    deleteSiteDataButton.check(matches(isDisplayed()))
-}
-
 private fun quickActionSheet() =
     mDevice.findObject(UiSelector().resourceId("$packageName:id/quick_action_sheet"))