Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

fix: stabilize develop catalog and sync tests

David Nashashaac5f7fe4ca5
diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt
index 69ac3731..56db9efa 100644
--- a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt
+++ b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt
@@ -591,7 +591,11 @@ internal companion object {
searchQuery: String? = null
): Result<StalkerPagedResult<StalkerVodCatalogItem>> {
val rawResult = mapPagedItems(categoryType, categoryId) { session, profile, rawCategoryId ->
- api.getVodStreamsPage(session, profile, rawCategoryId, page, searchQuery)
+ if (searchQuery == null) {
+ api.getVodStreamsPage(session, profile, rawCategoryId, page)
+ } else {
+ api.getVodStreamsPage(session, profile, rawCategoryId, page, searchQuery)
+ }
}
return when (rawResult) {
is Result.Success -> {
@@ -632,6 +636,7 @@ internal companion object {
}
is Result.Error -> Result.error(rawResult.message, rawResult.exception)
is Result.Loading -> Result.error("Unexpected loading state")
+ else -> Result.error("Portal returned no item response")
}
}
@@ -709,8 +714,8 @@ internal companion object {
ContentType.SERIES_EPISODE -> ContentType.SERIES
else -> type
}
- return resolveRawCategoryId(normalizedType, categoryId)?.trim() == "*" ||
- categoryId == syntheticCategoryId(normalizedType, "*")
+ return categoryId == syntheticCategoryId(normalizedType, "*") ||
+ resolveRawCategoryId(normalizedType, categoryId)?.trim() == "*"
}
override suspend fun getSeriesInfo(seriesId: Long): Result<Series> =
diff --git a/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt b/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt
index 6bc3533d..ce3005ad 100644
--- a/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt
+++ b/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt
@@ -155,7 +155,7 @@ class StalkerProviderTest {
@Test
fun shortEpgRequest_preservesNumericErrorWhenXmlFallbackIsEmpty() = runTest {
- val numericFailure = Result.error<List<StalkerProgramRecord>>(
+ val numericFailure = Result.error(
message = "temporary portal failure",
exception = IllegalStateException("temporary portal failure")
)
diff --git a/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt b/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt
index 5ede45db..d1e81d89 100644
--- a/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt
+++ b/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt
@@ -29,6 +29,7 @@ import com.streamvault.data.remote.stalker.StalkerPlaybackDescriptor
import com.streamvault.data.remote.stalker.StalkerPlaybackMode
import com.streamvault.data.remote.stalker.StalkerProgramRecord
import com.streamvault.data.remote.stalker.StalkerProviderProfile
+import com.streamvault.data.remote.stalker.StalkerProvider
import com.streamvault.data.remote.stalker.StalkerPortalCapabilities
import com.streamvault.data.remote.stalker.StalkerSeasonRecord
import com.streamvault.data.remote.stalker.StalkerSeriesDetails
@@ -48,6 +49,7 @@ import com.streamvault.domain.provider.StalkerPlaybackObservation
import com.streamvault.domain.repository.ProviderSnapshotRepository
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.runBlocking
+import org.junit.Before
import org.junit.Test
import org.mockito.kotlin.mock
import org.mockito.kotlin.whenever
@@ -60,6 +62,12 @@ class XtreamStreamUrlResolverTest {
private val stalkerApiService = FakeStalkerApiService()
+ @Before
+ fun clearStalkerCaches() {
+ StalkerProvider.clearSharedAuthCacheForTests()
+ StalkerProvider.clearResolvedStreamUrlCacheForTests()
+ }
+
private fun preferencesRepository(
liveStreamFormatMode: LiveStreamFormatMode = LiveStreamFormatMode.AUTO
): PreferencesRepository = mock<PreferencesRepository>().apply {
diff --git a/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt
index fb5e937e..0da5bd9b 100644
--- a/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt
+++ b/data/src/test/java/com/streamvault/data/repository/MovieRepositoryImplTest.kt
@@ -12,6 +12,7 @@ import com.streamvault.data.local.dao.XtreamContentIndexDao
import com.streamvault.data.local.dao.XtreamIndexJobDao
import com.streamvault.data.local.DatabaseTransactionRunner
import com.streamvault.data.local.entity.FavoriteEntity
+import com.streamvault.data.local.entity.CategoryEntity
import com.streamvault.data.local.entity.MovieBrowseEntity
import com.streamvault.data.local.entity.MovieCategoryHydrationEntity
import com.streamvault.data.local.entity.MovieEntity
@@ -599,7 +600,7 @@ class MovieRepositoryImplTest {
whenever(movieDao.getByCategoryPreview(7L, wildcardId, 18)).thenReturn(
flowOf(
listOf(
- MovieEntity(
+ MovieBrowseEntity(
id = 1L,
streamId = 1L,
name = "Movie",
diff --git a/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt
index 3d577bf1..9a01da0f 100644
--- a/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt
+++ b/data/src/test/java/com/streamvault/data/repository/SeriesRepositoryImplTest.kt
@@ -13,6 +13,7 @@ import com.streamvault.data.local.dao.XtreamContentIndexDao
import com.streamvault.data.local.dao.XtreamIndexJobDao
import com.streamvault.data.local.entity.EpisodeBrowseEntity
import com.streamvault.data.local.entity.EpisodeEntity
+import com.streamvault.data.local.entity.CategoryEntity
import com.streamvault.data.local.entity.SeriesEntity
import com.streamvault.data.local.entity.SeriesBrowseEntity
import com.streamvault.data.local.entity.SeriesCategoryHydrationEntity
@@ -76,6 +77,7 @@ import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.delay
import kotlinx.coroutines.test.runTest
import kotlinx.coroutines.runBlocking
+import org.junit.Before
import org.junit.Test
import org.mockito.kotlin.any
import org.mockito.kotlin.anyOrNull
@@ -103,6 +105,12 @@ class SeriesRepositoryImplTest {
private val preferencesRepository: PreferencesRepository = mock()
private val xtreamStreamUrlResolver: XtreamStreamUrlResolver = mock()
private val seriesCategoryHydrationDao: SeriesCategoryHydrationDao = mock()
+
+ @Before
+ fun clearStalkerCaches() {
+ StalkerProvider.clearSharedAuthCacheForTests()
+ StalkerProvider.clearResolvedStreamUrlCacheForTests()
+ }
private val jellyfinProvider: JellyfinProvider = mock()
private val xtreamContentIndexDao: XtreamContentIndexDao = mock()
private val xtreamIndexJobDao: XtreamIndexJobDao = mock()
@@ -489,7 +497,7 @@ class SeriesRepositoryImplTest {
whenever(seriesDao.getByCategoryPreview(7L, wildcardId, 18)).thenReturn(
flowOf(
listOf(
- SeriesEntity(
+ SeriesBrowseEntity(
id = 1L,
seriesId = 1L,
providerSeriesId = "1",
diff --git a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt
index 6a20a7a5..9b791338 100644
--- a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt
+++ b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt
@@ -62,6 +62,7 @@ import com.streamvault.data.remote.stalker.StalkerItemRecord
import com.streamvault.data.remote.stalker.StalkerPagedItems
import com.streamvault.data.remote.stalker.StalkerProgramRecord
import com.streamvault.data.remote.stalker.StalkerProviderProfile
+import com.streamvault.data.remote.stalker.StalkerProvider
import com.streamvault.data.remote.stalker.StalkerRemoteIdentityResolver
import com.streamvault.data.remote.stalker.stalkerStableHashId
import com.streamvault.data.remote.stalker.StalkerSession
@@ -303,6 +304,8 @@ class SyncManagerTest {
@Before
fun setup() {
+ StalkerProvider.clearSharedAuthCacheForTests()
+ StalkerProvider.clearResolvedStreamUrlCacheForTests()
xtreamBackend.reset()
syncMetadataRepo.reset()
reset(
diff --git a/feature/live/src/test/java/com/streamvault/feature/live/epg/EpgViewModelTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/epg/EpgViewModelTest.kt
index 032c0932..5db93a84 100644
--- a/feature/live/src/test/java/com/streamvault/feature/live/epg/EpgViewModelTest.kt
+++ b/feature/live/src/test/java/com/streamvault/feature/live/epg/EpgViewModelTest.kt
@@ -156,7 +156,7 @@ class EpgViewModelTest {
}
@Test
- fun `guide loads programs with one batched repository call`() = runTest {
+ fun `guide loads programs with one batched repository call and omits empty channels`() = runTest {
val provider = Provider(
id = 1L,
name = "Provider",
@@ -202,9 +202,9 @@ class EpgViewModelTest {
val viewModel = createViewModel()
advanceUntilIdle()
- waitForUiState { viewModel.uiState.value.programsByChannel.keys.containsAll(listOf("one", "two")) }
+ waitForUiState { viewModel.uiState.value.programsByChannel.keys == setOf("one") }
- assertThat(viewModel.uiState.value.programsByChannel.keys).containsExactly("one", "two")
+ assertThat(viewModel.uiState.value.programsByChannel.keys).containsExactly("one")
verify(epgRepository, atLeastOnce()).getResolvedProgramsForChannels(eq(provider.id), eq(listOf(1L, 2L)), any(), any())
verify(epgRepository, atLeastOnce()).getProgramsForChannelsSnapshot(eq(provider.id), eq(listOf("one", "two")), any(), any())
verify(epgRepository, never()).getProgramsForChannel(any(), any(), any(), any())
diff --git a/feature/live/src/test/java/com/streamvault/feature/live/presentation/epg/LiveEpgKeysTest.kt b/feature/live/src/test/java/com/streamvault/feature/live/presentation/epg/LiveEpgKeysTest.kt
index 467470c9..ecfcb6ff 100644
--- a/feature/live/src/test/java/com/streamvault/feature/live/presentation/epg/LiveEpgKeysTest.kt
+++ b/feature/live/src/test/java/com/streamvault/feature/live/presentation/epg/LiveEpgKeysTest.kt
@@ -15,7 +15,7 @@ class LiveEpgKeysTest {
)
assertThat(liveEpgChannelKey(channel, index = 3))
- .isEqualTo("channel:42:7:xmltv.news:News:3")
+ .isEqualTo("channel:42:7:7:News:3")
}
@Test