Improved the logs to capture the error. Also, improved the closing of…

… google dialog if visible
kiwix · Nov 15, 2024 · 61fe23a · 61fe23a
1 parent f8f6b4c
commit 61fe23a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 21 deletions.
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/widgets/SearchWidgetRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/widgets/SearchWidgetRobot.kt
@@ -55,10 +55,21 @@ class SearchWidgetRobot : BaseRobot() {
       uiDevice.waitForIdle()
     } catch (ignore: Exception) {
       // nothing to do since widget is not added
-      Log.e("SEARCH_WIDGET", "Could not find the Search widget. It likely does not exist.")
+      Log.e(
+        "SEARCH_WIDGET_TEST",
+        "Could not find the Search widget. It likely does not exist."
+      )
     }
   }
 
+  fun assertAddWidgetToHomeScreenVisible(): Boolean =
+    try {
+      isVisible(Text("Add automatically"))
+      true
+    } catch (ignore: Exception) {
+      false
+    }
+
   fun addWidgetToHomeScreenFromWidgetWindow() {
     testFlakyView({ clickOn(Text("Add automatically")) })
   }
@@ -95,10 +106,10 @@ class SearchWidgetRobot : BaseRobot() {
     clickOnElementById(uiDevice, kiwixMainActivity, "search_widget_mic")
   }
 
-  fun closeIfGoogleSearchVisible(uiDevice: UiDevice) {
+  fun closeIfGoogleSearchVisible() {
     try {
       pauseForBetterTestPerformance()
-      testFlakyView({ uiDevice.findObject(By.text("Google")) })
+      testFlakyView({ isVisible(Text("Google")) })
       pressBack()
       Log.e("SEARCH_WIDGET_TEST", "Closed the Google speak dialog")
     } catch (ignore: Exception) {
@@ -149,7 +160,7 @@ class SearchWidgetRobot : BaseRobot() {
         return
       } catch (e: UiObjectNotFoundException) {
         attempts++
-        Log.e("SEARCH_WIDGET", "Attempt $attempts: Failed to click on $elementId")
+        Log.e("SEARCH_WIDGET_TEST", "Attempt $attempts: Failed to click on $elementId")
       }
     }
     throw RuntimeException("Could not find $elementId after $retryCount attempts")

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/widgets/SearchWidgetTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/widgets/SearchWidgetTest.kt
@@ -97,23 +97,25 @@ class SearchWidgetTest : BaseActivityTest() {
         pressHome()
         uiDevice.waitForIdle()
         if (addWidgetToHomeScreen()) {
-          addWidgetToHomeScreenFromWidgetWindow()
-          assertSearchWidgetAddedToHomeScreen()
-          clickOnBookmarkIcon(uiDevice, kiwixMainActivity)
-          assertBookmarkScreenVisible()
-          pressBack()
-          pressHome()
-          findSearchWidget(uiDevice)
-          clickOnMicIcon(uiDevice, kiwixMainActivity)
-          closeIfGoogleSearchVisible(uiDevice)
-          assertSearchScreenVisible()
-          pressBack()
-          pressHome()
-          findSearchWidget(uiDevice)
-          clickOnSearchText(uiDevice, kiwixMainActivity)
-          assertSearchScreenVisible()
-          pressHome()
-          removeWidgetIfAlreadyAdded(uiDevice)
+          if (assertAddWidgetToHomeScreenVisible()) {
+            addWidgetToHomeScreenFromWidgetWindow()
+            assertSearchWidgetAddedToHomeScreen()
+            clickOnBookmarkIcon(uiDevice, kiwixMainActivity)
+            assertBookmarkScreenVisible()
+            pressBack()
+            pressHome()
+            findSearchWidget(uiDevice)
+            clickOnMicIcon(uiDevice, kiwixMainActivity)
+            closeIfGoogleSearchVisible()
+            assertSearchScreenVisible()
+            pressBack()
+            pressHome()
+            findSearchWidget(uiDevice)
+            clickOnSearchText(uiDevice, kiwixMainActivity)
+            assertSearchScreenVisible()
+            pressHome()
+            removeWidgetIfAlreadyAdded(uiDevice)
+          }
         }
       }
     }