From 13ed5ca34ae840199a459b19cc1dbf17ed5b43c6 Mon Sep 17 00:00:00 2001 From: s-ayush2903 Date: Tue, 25 Aug 2020 21:32:19 +0530 Subject: [PATCH] Separated some functions to Robot --- .../settings/KiwixSettingsActivityTest.kt | 15 +++++------- .../kiwixmobile/settings/SettingsRobot.kt | 24 +++++++++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.kt index f9d22faea..e9ce88aa1 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivityTest.kt @@ -27,19 +27,16 @@ class KiwixSettingsActivityTest : BaseActivityTest() { override var activityRule = activityTestRule() @Test - fun testToggle() { + fun testToggling() { settingsRobo { - clickOn(R.string.pref_back_to_top) - clickOn(R.string.pref_newtab_background_title) - clickOn(R.string.pref_external_link_popup_title) - clickOn(R.string.pref_wifi_only) + toggleButtons() } } @Test fun testLanguageDialog() { settingsRobo { - clickOn(R.string.device_default) + invokeLanguageDialog() assertDisplayed(R.string.pref_language_title) } } @@ -47,7 +44,7 @@ class KiwixSettingsActivityTest : BaseActivityTest() { @Test fun testStorageDialog() { settingsRobo { - clickOn(R.string.internal_storage, R.string.external_storage) + invokeStorageDialog() assertDisplayed(R.string.pref_storage) } } @@ -55,7 +52,7 @@ class KiwixSettingsActivityTest : BaseActivityTest() { @Test fun testHistoryDialog() { settingsRobo { - clickOn(R.string.pref_clear_all_history_title) + invokeHistoryDeletionDialog() assertDisplayed(R.string.clear_all_history_dialog_title) } } @@ -63,7 +60,7 @@ class KiwixSettingsActivityTest : BaseActivityTest() { @Test fun testNightModeDialog() { settingsRobo { - clickOn(R.string.pref_night_mode) + invokeNightModeDialog() for (nightModeString in nightModeStrings()) { assertDisplayed(nightModeString) } diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/SettingsRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/SettingsRobot.kt index 9985f55eb..301b78117 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/SettingsRobot.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/SettingsRobot.kt @@ -30,6 +30,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText import org.hamcrest.Matcher import org.hamcrest.Matchers import org.kiwix.kiwixmobile.BaseRobot +import org.kiwix.kiwixmobile.core.R /** * Authored by Ayush Shrivastava on 25/8/20 @@ -53,4 +54,27 @@ class SettingsRobot : BaseRobot() { ) ) } + + fun toggleButtons() { + clickOn(R.string.pref_back_to_top) + clickOn(R.string.pref_newtab_background_title) + clickOn(R.string.pref_external_link_popup_title) + clickOn(R.string.pref_wifi_only) + } + + fun invokeLanguageDialog() { + clickOn(R.string.device_default) + } + + fun invokeStorageDialog() { + clickOn(R.string.internal_storage, R.string.external_storage) + } + + fun invokeHistoryDeletionDialog() { + clickOn(R.string.pref_clear_all_history_title) + } + + fun invokeNightModeDialog() { + clickOn(R.string.pref_night_mode) + } }