Bug 1883014 - Add logs to SystemSettingsRobot

app/src/androidTest/java/org/mozilla/fenix/ui/robots/SystemSettingsRobot.kt

@@ -4,52 +4,72 @@
 
 package org.mozilla.fenix.ui.robots
 
+import android.util.Log
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
 import androidx.test.uiautomator.UiSelector
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
-import org.mozilla.fenix.helpers.MatcherHelper.assertUIObjectExists
-import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
+import org.mozilla.fenix.helpers.Constants.TAG
 import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndDescription
-import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
-import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 
 class SystemSettingsRobot {
-    fun verifySystemNotificationsView() = assertSystemNotificationsView()
+
     fun verifyNotifications() {
+        Log.i(TAG, "verifyNotifications: Trying to verify the intent to the notifications settings")
         Intents.intended(hasAction("android.settings.APP_NOTIFICATION_SETTINGS"))
+        Log.i(TAG, "verifyNotifications: Verified the intent to the notifications settings")
     }
 
     fun verifyMakeDefaultBrowser() {
+        Log.i(TAG, "verifyMakeDefaultBrowser: Trying to verify the intent to the default apps settings")
         Intents.intended(hasAction(SettingsRobot.DEFAULT_APPS_SETTINGS_ACTION))
+        Log.i(TAG, "verifyMakeDefaultBrowser: Verified the intent to the default apps settings")
     }
 
     fun verifyAllSystemNotificationsToggleState(enabled: Boolean) {
         if (enabled) {
-            assertTrue(allSystemSettingsNotificationsToggle().isChecked)
+            Log.i(TAG, "verifyAllSystemNotificationsToggleState: Trying to verify that the system settings \"Show notifications\" toggle is checked")
+            assertTrue("$TAG: The system settings \"Show notifications\" toggle is not checked", allSystemSettingsNotificationsToggle().isChecked)
+            Log.i(TAG, "verifyAllSystemNotificationsToggleState: Verified that the system settings \"Show notifications\" toggle is checked")
         } else {
-            assertFalse(allSystemSettingsNotificationsToggle().isChecked)
+            Log.i(TAG, "verifyAllSystemNotificationsToggleState: Trying to verify that the system settings \"Show notifications\" toggle is not checked")
+            assertFalse("$TAG: The system settings \"Show notifications\" toggle is checked", allSystemSettingsNotificationsToggle().isChecked)
+            Log.i(TAG, "verifyAllSystemNotificationsToggleState: Verified that the system settings \"Show notifications\" toggle is not checked")
         }
     }
 
     fun verifyPrivateBrowsingSystemNotificationsToggleState(enabled: Boolean) {
         if (enabled) {
-            assertTrue(privateBrowsingSystemSettingsNotificationsToggle().isChecked)
+            Log.i(TAG, "verifyPrivateBrowsingSystemNotificationsToggleState: Trying to verify that the system settings \"Private browsing session\" toggle is checked")
+            assertTrue("$TAG: The system settings \"Private browsing sessio\" toggle is not checked", privateBrowsingSystemSettingsNotificationsToggle().isChecked)
+            Log.i(TAG, "verifyPrivateBrowsingSystemNotificationsToggleState: Verified that the system settings \"Private browsing session\" toggle is checked")
         } else {
-            assertFalse(privateBrowsingSystemSettingsNotificationsToggle().isChecked)
+            Log.i(TAG, "verifyPrivateBrowsingSystemNotificationsToggleState: Trying to verify that the system settings \"Private browsing session\" toggle is not checked")
+            assertFalse("$TAG: The system settings \"Private browsing session\" toggle is checked", privateBrowsingSystemSettingsNotificationsToggle().isChecked)
+            Log.i(TAG, "verifyPrivateBrowsingSystemNotificationsToggleState: Verified that the system settings \"Private browsing session\" toggle is not checked")
         }
     }
 
-    fun clickPrivateBrowsingSystemNotificationsToggle() = privateBrowsingSystemSettingsNotificationsToggle().click()
+    fun clickPrivateBrowsingSystemNotificationsToggle() {
+        Log.i(TAG, "clickPrivateBrowsingSystemNotificationsToggle: Trying to click the system settings \"Private browsing session\" toggle")
+        privateBrowsingSystemSettingsNotificationsToggle().click()
+        Log.i(TAG, "clickPrivateBrowsingSystemNotificationsToggle: Clicked the system settings \"Private browsing session\" toggle")
+    }
 
-    fun clickAllSystemNotificationsToggle() = allSystemSettingsNotificationsToggle().click()
+    fun clickAllSystemNotificationsToggle() {
+        Log.i(TAG, "clickAllSystemNotificationsToggle: Trying to click the system settings \"Show notifications\" toggle")
+        allSystemSettingsNotificationsToggle().click()
+        Log.i(TAG, "clickAllSystemNotificationsToggle: Clicked the system settings \"Show notifications\" toggle")
+    }
 
     class Transition {
         // Difficult to know where this will go
         fun goBack(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition {
+            Log.i(TAG, "goBack: Trying to click device back button")
             mDevice.pressBack()
+            Log.i(TAG, "goBack: Clicked device back button")
 
             SettingsRobot().interact()
             return SettingsRobot.Transition()
@@ -62,12 +82,6 @@ fun systemSettings(interact: SystemSettingsRobot.() -> Unit): SystemSettingsRobo
     return SystemSettingsRobot.Transition()
 }
 
-private fun assertSystemNotificationsView() {
-    mDevice.findObject(UiSelector().resourceId("com.android.settings:id/list"))
-        .waitForExists(waitingTime)
-    assertUIObjectExists(itemContainingText("All ${TestHelper.appName} notifications"))
-}
-
 private fun allSystemSettingsNotificationsToggle() =
     mDevice.findObject(
         UiSelector().resourceId("com.android.settings:id/switch_bar")