From 8575c604d2e7f429c2a6e77fc43e6f7e99921082 Mon Sep 17 00:00:00 2001 From: AndiAJ Date: Fri, 1 Mar 2024 12:02:25 +0200 Subject: [PATCH] Bug 1882987 - Add logs to SiteSecurityRobot --- .../fenix/ui/robots/SiteSecurityRobot.kt | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) 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 1375a5266..7a7684b70 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 @@ -6,6 +6,7 @@ package org.mozilla.fenix.ui.robots +import android.util.Log import androidx.test.espresso.Espresso.onView import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.RootMatchers @@ -14,6 +15,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.uiautomator.UiSelector import mozilla.components.support.ktx.kotlin.tryGetHostFromUrl import org.mozilla.fenix.R +import org.mozilla.fenix.helpers.Constants.TAG import org.mozilla.fenix.helpers.DataGenerationHelper.getStringResource import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime @@ -27,7 +29,9 @@ import org.mozilla.fenix.helpers.TestHelper.packageName class SiteSecurityRobot { fun verifyQuickActionSheet(url: String = "", isConnectionSecure: Boolean) { + Log.i(TAG, "verifyQuickActionSheet: Waiting for $waitingTime ms for quick action sheet to exist") quickActionSheet().waitForExists(waitingTime) + Log.i(TAG, "verifyQuickActionSheet: Waited for $waitingTime ms for quick action sheet to exist") assertUIObjectExists( quickActionSheetUrl(url.tryGetHostFromUrl()), quickActionSheetSecurityInfo(isConnectionSecure), @@ -36,11 +40,17 @@ class SiteSecurityRobot { ) } fun openSecureConnectionSubMenu(isConnectionSecure: Boolean) { + Log.i(TAG, "openSecureConnectionSubMenu: Trying to click the security info button while connection is secure: $isConnectionSecure") quickActionSheetSecurityInfo(isConnectionSecure).click() + Log.i(TAG, "openSecureConnectionSubMenu: Clicked the security info button while connection is secure: $isConnectionSecure") + Log.i(TAG, "openSecureConnectionSubMenu: Trying to click the security info button and wait for $waitingTimeShort ms for a new window") mDevice.waitForWindowUpdate(packageName, waitingTimeShort) + Log.i(TAG, "openSecureConnectionSubMenu: Clicked the security info button and waited for $waitingTimeShort ms for a new window") } fun verifySecureConnectionSubMenu(pageTitle: String = "", url: String = "", isConnectionSecure: Boolean) { + Log.i(TAG, "verifySecureConnectionSubMenu: Waiting for $waitingTime ms for secure connection submenu to exist") secureConnectionSubMenu().waitForExists(waitingTime) + Log.i(TAG, "verifySecureConnectionSubMenu: Waited for $waitingTime ms for secure connection submenu to exist") assertUIObjectExists( secureConnectionSubMenuPageTitle(pageTitle), secureConnectionSubMenuPageUrl(url), @@ -49,11 +59,19 @@ class SiteSecurityRobot { secureConnectionSubMenuCertificateInfo(), ) } - fun clickQuickActionSheetClearSiteData() = quickActionSheetClearSiteData().click() + fun clickQuickActionSheetClearSiteData() { + Log.i(TAG, "clickQuickActionSheetClearSiteData: Trying to click the \"Clear cookies and site data\" button") + quickActionSheetClearSiteData().click() + Log.i(TAG, "clickQuickActionSheetClearSiteData: Clicked the \"Clear cookies and site data\" button") + } fun verifyClearSiteDataPrompt(url: String) { assertUIObjectExists(clearSiteDataPrompt(url)) + Log.i(TAG, "verifyClearSiteDataPrompt: Trying to verify that the \"Cancel\" dialog button is displayed") cancelClearSiteDataButton().check(matches(isDisplayed())) + Log.i(TAG, "verifyClearSiteDataPrompt: Verified that the \"Cancel\" dialog button is displayed") + Log.i(TAG, "verifyClearSiteDataPrompt: Trying to verify that the \"Delete\" dialog button is displayed") deleteSiteDataButton().check(matches(isDisplayed())) + Log.i(TAG, "verifyClearSiteDataPrompt: Verified that the \"Delete\" dialog button is displayed") } class Transition