From f50f53dbe6fd94e9ada8d0e3b7df9f6dba00d2db Mon Sep 17 00:00:00 2001
From: s-ayush2903 <ayush_1901cb14@iitp.ac.in>
Date: Wed, 4 Nov 2020 13:41:35 +0530
Subject: [PATCH] Extracted out common nav drawer functionality

---
 .../kiwix/kiwixmobile/main/KiwixMainRobot.kt  | 12 +++---
 .../main/TopLevelDestinationTest.kt           | 43 ++++++++++---------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/KiwixMainRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/KiwixMainRobot.kt
index a623b3506..a5133541f 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/KiwixMainRobot.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/KiwixMainRobot.kt
@@ -38,6 +38,7 @@ import org.kiwix.kiwixmobile.page.history.HistoryRobot
 import org.kiwix.kiwixmobile.page.history.history
 import org.kiwix.kiwixmobile.settings.SettingsRobot
 import org.kiwix.kiwixmobile.settings.settingsRobo
+import org.kiwix.kiwixmobile.utils.StandardActions.openDrawer
 import org.kiwix.kiwixmobile.webserver.ZimHostRobot
 import org.kiwix.kiwixmobile.webserver.zimHost
 
@@ -72,36 +73,37 @@ class KiwixMainRobot : BaseRobot() {
     pressBack()
   }
 
+  fun inNavDrawer(navDrawerAction: () -> Unit) {
+    openDrawer()
+    navDrawerAction.invoke()
+    pressBack()
+  }
+
   fun clickBookmarksOnNavDrawer(func: BookmarksRobot.() -> Unit) {
     clickOn(TextId(R.string.bookmarks))
     bookmarks(func)
     pressBack()
-    pressBack()
   }
 
   fun clickHistoryOnSideNav(func: HistoryRobot.() -> Unit) {
     clickOn(TextId(R.string.history))
     history(func)
     pressBack()
-    pressBack()
   }
 
   fun clickHostBooksOnSideNav(func: ZimHostRobot.() -> Unit) {
     clickOn(TextId(R.string.menu_host_books))
     zimHost(func)
-    pressBack()
   }
 
   fun clickSettingsOnSideNav(func: SettingsRobot.() -> Unit) {
     clickOn(TextId(R.string.menu_settings))
     settingsRobo(func)
-    pressBack()
   }
 
   fun clickHelpOnSideNav(func: HelpRobot.() -> Unit) {
     clickOn(TextId(R.string.menu_help))
     help(func)
-    pressBack()
   }
 
   fun clickSupportKiwixOnSideNav() {
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationTest.kt
index 0f0198e27..fdea83c6a 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationTest.kt
@@ -20,7 +20,6 @@ package org.kiwix.kiwixmobile.main
 import androidx.test.rule.ActivityTestRule
 import org.junit.Rule
 import org.junit.Test
-import org.kiwix.kiwixmobile.utils.StandardActions.openDrawer
 
 class TopLevelDestinationTest {
   @Rule
@@ -40,30 +39,34 @@ class TopLevelDestinationTest {
         clickOnGlobeIcon {
         }
       }
-      openDrawer()
-
-      clickBookmarksOnNavDrawer {
-        clickOnTrashIcon()
-        assertDeleteBookmarksDialogDisplayed()
+      inNavDrawer {
+        clickBookmarksOnNavDrawer {
+          clickOnTrashIcon()
+          assertDeleteBookmarksDialogDisplayed()
+        }
       }
-      openDrawer()
-      clickHistoryOnSideNav {
-        clickOnTrashIcon()
-        assertDeleteHistoryDialogDisplayed()
+      inNavDrawer {
+        clickHistoryOnSideNav {
+          clickOnTrashIcon()
+          assertDeleteHistoryDialogDisplayed()
+        }
       }
-      openDrawer()
-      clickHostBooksOnSideNav {
+      inNavDrawer {
+        clickHostBooksOnSideNav {
+        }
       }
-      openDrawer()
-      clickSettingsOnSideNav {
+      inNavDrawer {
+        clickSettingsOnSideNav {
+        }
       }
-      openDrawer()
-      clickHelpOnSideNav {
+      inNavDrawer {
+        clickHelpOnSideNav {
+        }
+      }
+      inNavDrawer {
+        clickSupportKiwixOnSideNav()
+        assertExternalLinkDialogDisplayed()
       }
-      openDrawer()
-      clickSupportKiwixOnSideNav()
-      assertExternalLinkDialogDisplayed()
-      pressBack()
       pressBack()
     }
   }