From 9a74f2abf2b26f1eae98ede3485dba715af37b19 Mon Sep 17 00:00:00 2001
From: MohitMali <futuretechnoworld.mohit@gmail.com>
Date: Mon, 19 Dec 2022 12:46:12 +0530
Subject: [PATCH] Fixed sometimes CI fails in LanguageFragmentTest

---
 .../kiwix/kiwixmobile/language/LanguageFragmentTest.kt    | 8 +-------
 .../java/org/kiwix/kiwixmobile/language/LanguageRobot.kt  | 4 ++++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.kt
index aebbb52e8..47fed3718 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.kt
@@ -25,7 +25,6 @@ import androidx.preference.PreferenceManager
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.statement.UiThreadStatement
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import androidx.test.uiautomator.UiDevice
@@ -33,7 +32,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.kiwix.kiwixmobile.R
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
 import org.kiwix.kiwixmobile.main.KiwixMainActivity
 
@@ -69,13 +67,9 @@ class LanguageFragmentTest {
   @Test
   fun testLanguageFragment() {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-      UiThreadStatement.runOnUiThread {
-        activityScenarioRule.scenario.onActivity {
-          it.navigate(R.id.downloadsFragment)
-        }
-      }
 
       language {
+        clickDownloadOnBottomNav()
         waitForDataToLoad()
 
         // search and de-select if german language already selected
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageRobot.kt
index 687cbc22b..5dff8b703 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageRobot.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageRobot.kt
@@ -38,6 +38,10 @@ class LanguageRobot : BaseRobot() {
 
   private var retryCountForDataToLoad = 5
 
+  fun clickDownloadOnBottomNav() {
+    clickOn(ViewId(R.id.downloadsFragment))
+  }
+
   fun waitForDataToLoad() {
     try {
       isVisible(Findable.Text("Off the Grid"))