Fixed MimeTypeTest, EncodedUrlTest, and ZimFileReaderWithSplittedZimFileTest which sometimes failing on CI

This commit is contained in:
MohitMaliFtechiz 2024-11-08 16:42:31 +05:30
parent f9bf7b2d00
commit f3d115cde1
3 changed files with 110 additions and 125 deletions

View File

@ -21,12 +21,11 @@ package org.kiwix.kiwixmobile.mimetype
import androidx.core.content.ContextCompat
import androidx.core.content.edit
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.preference.PreferenceManager
import androidx.test.core.app.ActivityScenario
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.uiautomator.UiDevice
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.junit.After
import org.junit.Assert
import org.junit.Before
@ -70,7 +69,7 @@ class MimeTypeTest : BaseActivityTest() {
}
@Test
fun testMimeType() {
fun testMimeType() = runBlocking {
val loadFileStream = MimeTypeTest::class.java.classLoader.getResourceAsStream("testzim.zim")
val zimFile = File(
ContextCompat.getExternalFilesDirs(context, null)[0],
@ -89,8 +88,6 @@ class MimeTypeTest : BaseActivityTest() {
}
}
val zimSource = ZimReaderSource(zimFile)
activityScenario.onActivity {
it.lifecycleScope.launch {
val archive = zimSource.createArchive()
val zimFileReader = ZimFileReader(
zimSource,
@ -123,8 +120,6 @@ class MimeTypeTest : BaseActivityTest() {
// dispose the ZimFileReader
zimFileReader.dispose()
}
}
}
@After
fun finish() {

View File

@ -21,12 +21,11 @@ package org.kiwix.kiwixmobile.reader
import androidx.core.content.ContextCompat
import androidx.core.content.edit
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.preference.PreferenceManager
import androidx.test.core.app.ActivityScenario
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.uiautomator.UiDevice
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.junit.After
import org.junit.Assert
import org.junit.Before
@ -76,7 +75,7 @@ class EncodedUrlTest : BaseActivityTest() {
}
@Test
fun testEncodedUrls() {
fun testEncodedUrls() = runBlocking {
val loadFileStream =
EncodedUrlTest::class.java.classLoader.getResourceAsStream("characters_encoding.zim")
val zimFile = File(
@ -96,8 +95,6 @@ class EncodedUrlTest : BaseActivityTest() {
}
}
val zimReaderSource = ZimReaderSource(zimFile)
activityScenario.onActivity {
it.lifecycleScope.launch {
val archive = zimReaderSource.createArchive()
val zimFileReader = ZimFileReader(
zimReaderSource,
@ -167,8 +164,6 @@ class EncodedUrlTest : BaseActivityTest() {
// dispose the ZimFileReader
zimFileReader.dispose()
}
}
}
@After
fun finish() {

View File

@ -22,7 +22,6 @@ import androidx.core.content.ContextCompat
import androidx.core.content.edit
import androidx.core.net.toUri
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.preference.PreferenceManager
import androidx.test.core.app.ActivityScenario
import androidx.test.espresso.accessibility.AccessibilityChecks
@ -33,7 +32,7 @@ import androidx.test.uiautomator.UiDevice
import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesCheck
import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesViews
import com.google.android.apps.common.testing.accessibility.framework.checks.TouchTargetSizeCheck
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.hamcrest.Matchers.allOf
import org.junit.After
import org.junit.Assert
@ -133,12 +132,10 @@ class ZimFileReaderWithSplittedZimFileTest : BaseActivityTest() {
}
@Test
fun testWithExtraZeroSizeFile() {
fun testWithExtraZeroSizeFile() = runBlocking {
createAndGetSplitedZimFile(true)?.let { zimFile ->
// test the articleCount and mediaCount of this zim file.
val zimReaderSource = ZimReaderSource(zimFile)
activityScenario.onActivity {
it.lifecycleScope.launch {
val archive = zimReaderSource.createArchive()
val zimFileReader = ZimFileReader(
zimReaderSource,
@ -148,8 +145,6 @@ class ZimFileReaderWithSplittedZimFileTest : BaseActivityTest() {
)
Assert.assertEquals(zimFileReader.mediaCount, 16)
Assert.assertEquals(zimFileReader.articleCount, 4)
}
}
} ?: kotlin.run {
// error in creating the zim file chunk
fail("Couldn't create the zim file chunk")