From 8fa15c12bd632c9c9cbdf1eb5867290539d453ac Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Tue, 2 Sep 2025 19:04:58 +0530 Subject: [PATCH] Refactored the test cases according to `savedStateHandle` approach. --- .../kiwix/kiwixmobile/main/DarkModeViewPainterTest.kt | 10 ++++++---- .../org/kiwix/kiwixmobile/note/NoteFragmentTest.kt | 10 ++++++---- .../kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt | 10 ++++++---- .../kiwixmobile/page/history/NavigationHistoryTest.kt | 10 ++++++---- .../kiwixmobile/reader/KiwixReaderFragmentTest.kt | 10 ++++++---- .../reader/ZimFileReaderWithSplittedZimFileTest.kt | 10 ++++++---- .../org/kiwix/kiwixmobile/search/SearchFragmentTest.kt | 10 ++++++---- 7 files changed, 42 insertions(+), 28 deletions(-) diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/DarkModeViewPainterTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/DarkModeViewPainterTest.kt index 0bbdb879d..56ab3b181 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/DarkModeViewPainterTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/DarkModeViewPainterTest.kt @@ -40,7 +40,9 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.kiwix.kiwixmobile.BaseActivityTest +import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setNavigationResultOnCurrent import org.kiwix.kiwixmobile.core.main.CoreMainActivity +import org.kiwix.kiwixmobile.core.main.ZIM_FILE_URI_KEY import org.kiwix.kiwixmobile.core.ui.components.NAVIGATION_ICON_TESTING_TAG import org.kiwix.kiwixmobile.core.utils.LanguageUtils import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil @@ -206,10 +208,10 @@ class DarkModeViewPainterTest : BaseActivityTest() { val navOptions = NavOptions.Builder() .setPopUpTo(KiwixDestination.Reader.route, false) .build() - composeTestRule.activity.navigate( - KiwixDestination.Reader.createRoute(zimFileUri = zimFile.toUri().toString()), - navOptions - ) + composeTestRule.activity.apply { + navigate(KiwixDestination.Reader.route, navOptions) + setNavigationResultOnCurrent(zimFile.toUri().toString(), ZIM_FILE_URI_KEY) + } } composeTestRule.waitForIdle() } diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteFragmentTest.kt index ceafc4d55..63791714a 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/note/NoteFragmentTest.kt @@ -43,7 +43,9 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.kiwix.kiwixmobile.BaseActivityTest +import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setNavigationResultOnCurrent import org.kiwix.kiwixmobile.core.main.CoreMainActivity +import org.kiwix.kiwixmobile.core.main.ZIM_FILE_URI_KEY import org.kiwix.kiwixmobile.core.utils.LanguageUtils.Companion.handleLocaleChange import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil import org.kiwix.kiwixmobile.core.utils.TestingUtils.COMPOSE_TEST_RULE_ORDER @@ -295,10 +297,10 @@ class NoteFragmentTest : BaseActivityTest() { val navOptions = NavOptions.Builder() .setPopUpTo(KiwixDestination.Reader.route, false) .build() - kiwixMainActivity.navigate( - KiwixDestination.Reader.createRoute(zimFileUri = zimFile.toUri().toString()), - navOptions - ) + kiwixMainActivity.apply { + kiwixMainActivity.navigate(KiwixDestination.Reader.route, navOptions) + setNavigationResultOnCurrent(zimFile.toUri().toString(), ZIM_FILE_URI_KEY) + } } } diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt index 3703b44e6..d4c25df5f 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt @@ -42,7 +42,9 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.kiwix.kiwixmobile.BaseActivityTest +import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setNavigationResultOnCurrent import org.kiwix.kiwixmobile.core.main.CoreMainActivity +import org.kiwix.kiwixmobile.core.main.ZIM_FILE_URI_KEY import org.kiwix.kiwixmobile.core.main.reader.CoreReaderFragment import org.kiwix.kiwixmobile.core.page.bookmark.adapter.LibkiwixBookmarkItem import org.kiwix.kiwixmobile.core.utils.LanguageUtils.Companion.handleLocaleChange @@ -259,10 +261,10 @@ class LibkiwixBookmarkTest : BaseActivityTest() { val navOptions = NavOptions.Builder() .setPopUpTo(KiwixDestination.Reader.route, false) .build() - kiwixMainActivity.navigate( - KiwixDestination.Reader.createRoute(zimFileUri = zimFile.toUri().toString()), - navOptions - ) + kiwixMainActivity.apply { + kiwixMainActivity.navigate(KiwixDestination.Reader.route, navOptions) + setNavigationResultOnCurrent(zimFile.toUri().toString(), ZIM_FILE_URI_KEY) + } } waitComposeToSettleViews() } diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/NavigationHistoryTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/NavigationHistoryTest.kt index 7ba9fe3a2..d80685b9c 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/NavigationHistoryTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/NavigationHistoryTest.kt @@ -42,7 +42,9 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.kiwix.kiwixmobile.BaseActivityTest +import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setNavigationResultOnCurrent import org.kiwix.kiwixmobile.core.main.CoreMainActivity +import org.kiwix.kiwixmobile.core.main.ZIM_FILE_URI_KEY import org.kiwix.kiwixmobile.core.utils.LanguageUtils.Companion.handleLocaleChange import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil import org.kiwix.kiwixmobile.core.utils.TestingUtils.COMPOSE_TEST_RULE_ORDER @@ -152,10 +154,10 @@ class NavigationHistoryTest : BaseActivityTest() { val navOptions = NavOptions.Builder() .setPopUpTo(KiwixDestination.Reader.route, false) .build() - kiwixMainActivity.navigate( - KiwixDestination.Reader.createRoute(zimFileUri = zimFile.toUri().toString()), - navOptions - ) + kiwixMainActivity.apply { + kiwixMainActivity.navigate(KiwixDestination.Reader.route, navOptions) + setNavigationResultOnCurrent(zimFile.toUri().toString(), ZIM_FILE_URI_KEY) + } } waitForIdle() } diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/KiwixReaderFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/KiwixReaderFragmentTest.kt index de9043513..b6dd4a200 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/KiwixReaderFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/KiwixReaderFragmentTest.kt @@ -46,7 +46,9 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.kiwix.kiwixmobile.BaseActivityTest +import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setNavigationResultOnCurrent import org.kiwix.kiwixmobile.core.main.CoreMainActivity +import org.kiwix.kiwixmobile.core.main.ZIM_FILE_URI_KEY import org.kiwix.kiwixmobile.core.utils.LanguageUtils.Companion.handleLocaleChange import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil import org.kiwix.kiwixmobile.core.utils.TestingUtils.COMPOSE_TEST_RULE_ORDER @@ -338,10 +340,10 @@ class KiwixReaderFragmentTest : BaseActivityTest() { val navOptions = NavOptions.Builder() .setPopUpTo(KiwixDestination.Reader.route, false) .build() - kiwixMainActivity.navigate( - KiwixDestination.Reader.createRoute(zimFileUri = zimFile.toUri().toString()), - navOptions - ) + kiwixMainActivity.apply { + kiwixMainActivity.navigate(KiwixDestination.Reader.route, navOptions) + setNavigationResultOnCurrent(zimFile.toUri().toString(), ZIM_FILE_URI_KEY) + } } } diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt index fdbb8c528..661b9582d 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt @@ -45,6 +45,8 @@ import org.junit.Test import org.junit.jupiter.api.fail import org.kiwix.kiwixmobile.BaseActivityTest import org.kiwix.kiwixmobile.core.DarkModeConfig +import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setNavigationResultOnCurrent +import org.kiwix.kiwixmobile.core.main.ZIM_FILE_URI_KEY import org.kiwix.kiwixmobile.core.reader.ZimFileReader import org.kiwix.kiwixmobile.core.reader.ZimReaderSource import org.kiwix.kiwixmobile.core.utils.LanguageUtils.Companion.handleLocaleChange @@ -125,10 +127,10 @@ class ZimFileReaderWithSplittedZimFileTest : BaseActivityTest() { val navOptions = NavOptions.Builder() .setPopUpTo(KiwixDestination.Reader.route, false) .build() - kiwixMainActivity.navigate( - KiwixDestination.Reader.createRoute(zimFileUri = it.toUri().toString()), - navOptions - ) + kiwixMainActivity.apply { + kiwixMainActivity.navigate(KiwixDestination.Reader.route, navOptions) + setNavigationResultOnCurrent(it.toUri().toString(), ZIM_FILE_URI_KEY) + } } composeTestRule.waitForIdle() navigationHistory { diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt index 3664a2c9f..582365004 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt @@ -46,6 +46,8 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.kiwix.kiwixmobile.BaseActivityTest +import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setNavigationResultOnCurrent +import org.kiwix.kiwixmobile.core.main.ZIM_FILE_URI_KEY import org.kiwix.kiwixmobile.core.search.SearchFragment import org.kiwix.kiwixmobile.core.search.viewmodel.Action import org.kiwix.kiwixmobile.core.utils.LanguageUtils.Companion.handleLocaleChange @@ -317,10 +319,10 @@ class SearchFragmentTest : BaseActivityTest() { val navOptions = NavOptions.Builder() .setPopUpTo(KiwixDestination.Reader.route, false) .build() - kiwixMainActivity.navigate( - KiwixDestination.Reader.createRoute(zimFileUri = zimFile.toUri().toString()), - navOptions - ) + kiwixMainActivity.apply { + kiwixMainActivity.navigate(KiwixDestination.Reader.route, navOptions) + setNavigationResultOnCurrent(zimFile.toUri().toString(), ZIM_FILE_URI_KEY) + } } }