kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-23 12:42:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved the testBookmarkRemainsSavedOrNot which sometimes fails on Android 15, and 16.

Browse Source
This commit is contained in:
MohitMaliFtechiz 2025-08-14 12:45:34 +05:30
parent 3b4a5d29fa
commit 2bc89b9ad2
2 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/BookmarksRobot.kt
View File

@ -132,10 +132,12 @@ class BookmarksRobot : BaseRobot() {
fun assertBookmarkSaved(composeTestRule: ComposeContentTestRule) {
pauseForBetterTestPerformance()
composeTestRule.apply {
waitForIdle()
onNodeWithText("Test Zim").assertExists()
}
testFlakyView({
composeTestRule.apply {
waitForIdle()
onNodeWithText("Test Zim").assertExists()
}
})
}
fun assertBookmarkRemoved(composeTestRule: ComposeTestRule) {

54
app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/LibkiwixBookmarkTest.kt
View File

@ -18,11 +18,15 @@
package org.kiwix.kiwixmobile.page.bookmarks
import android.accessibilityservice.AccessibilityService
import android.content.Context
import android.content.Intent
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.core.content.edit
import androidx.core.net.toUri
import androidx.navigation.NavOptions
import androidx.preference.PreferenceManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.espresso.accessibility.AccessibilityChecks
import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
import androidx.test.platform.app.InstrumentationRegistry
@ -128,8 +132,7 @@ class LibkiwixBookmarkTest : BaseActivityTest() {
navOptions
)
}
waitForIdle()
waitUntilTimeout() // to load the ZIM file properly.
waitComposeToSettleViews() // to load the ZIM file properly.
}
bookmarks {
// delete any bookmark if already saved to properly perform this test case.
@ -139,40 +142,47 @@ class LibkiwixBookmarkTest : BaseActivityTest() {
clickOnDeleteButton(composeTestRule)
assertNoBookMarkTextDisplayed(composeTestRule)
pressBack()
composeTestRule.apply {
waitForIdle()
waitUntilTimeout()
}
waitComposeToSettleViews()
// Test saving bookmark
clickOnSaveBookmarkImage(composeTestRule)
openBookmarkScreen(kiwixMainActivity as CoreMainActivity, composeTestRule)
assertBookmarkSaved(composeTestRule)
pressBack()
// Test removing bookmark
composeTestRule.apply {
waitForIdle()
waitUntilTimeout()
}
waitComposeToSettleViews()
clickOnSaveBookmarkImage(composeTestRule)
longClickOnSaveBookmarkImage(composeTestRule, TEST_PAUSE_MS_FOR_DOWNLOAD_TEST.toLong())
assertBookmarkRemoved(composeTestRule)
pressBack()
// Save the bookmark to test whether it remains saved after the application restarts or not.
composeTestRule.apply {
waitForIdle()
waitUntilTimeout()
}
waitComposeToSettleViews()
clickOnSaveBookmarkImage(composeTestRule)
waitComposeToSettleViews()
// Close the application.
InstrumentationRegistry.getInstrumentation().uiAutomation.performGlobalAction(
AccessibilityService.GLOBAL_ACTION_HOME
)
// wait a bit
waitComposeToSettleViews()
// reopen the application to test that book remains saved or not.
val context = ApplicationProvider.getApplicationContext<Context>()
val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
context.startActivity(intent)
InstrumentationRegistry.getInstrumentation().waitForIdleSync()
waitComposeToSettleViews()
topLevel {
clickBookmarksOnNavDrawer(kiwixMainActivity as CoreMainActivity, composeTestRule) {
assertBookmarkSaved(composeTestRule)
}
}
}
}
@Test
fun testBookmarkRemainsSavedOrNot() {
composeTestRule.waitForIdle()
topLevel {
clickBookmarksOnNavDrawer(kiwixMainActivity as CoreMainActivity, composeTestRule) {
assertBookmarkSaved(composeTestRule)
}
private fun waitComposeToSettleViews() {
composeTestRule.apply {
waitForIdle()
waitUntilTimeout()
}
}
@ -201,7 +211,7 @@ class LibkiwixBookmarkTest : BaseActivityTest() {
assertNoBookMarkTextDisplayed(composeTestRule)
pressBack()
}
composeTestRule.waitUntilTimeout()
waitComposeToSettleViews()
val coreReaderFragment = kiwixMainActivity.supportFragmentManager.fragments
.filterIsInstance<CoreReaderFragment>()
.firstOrNull()