StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
test: fix remaining data unit regressions
David Nashash975117259951
diff --git a/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.ktindex 42acf46b..beca0200 100644--- a/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt+++ b/data/src/main/java/com/streamvault/data/repository/EpgRepositoryImpl.kt@@ -47,7 +47,8 @@ class EpgRepositoryImpl @Inject constructor(private val xmltvParser: XmltvParser,private val okHttpClient: OkHttpClient,private val transactionRunner: DatabaseTransactionRunner,- private val epgSourceRepository: EpgSourceRepository+ private val epgSourceRepository: EpgSourceRepository,+ private val externalScope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)) : EpgRepository {private val providerRefreshMutexes = ConcurrentHashMap<Long, Mutex>()@@ -346,14 +347,12 @@ class EpgRepositoryImpl @Inject constructor(return emptyList()}- private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)-private val nowTicker: Flow<Long> = flow {while (true) {emit(System.currentTimeMillis())delay(NOW_AND_NEXT_REFRESH_INTERVAL_MS)}- }.shareIn(scope, SharingStarted.WhileSubscribed(), replay = 1)+ }.shareIn(externalScope, SharingStarted.WhileSubscribed(), replay = 1)private fun providerRefreshMutex(providerId: Long): Mutex =providerRefreshMutexes.computeIfAbsent(providerId) { Mutex() }diff --git a/data/src/main/java/com/streamvault/data/sync/BackgroundEpgSyncWorker.kt b/data/src/main/java/com/streamvault/data/sync/BackgroundEpgSyncWorker.ktindex 4fccf366..3017551a 100644--- a/data/src/main/java/com/streamvault/data/sync/BackgroundEpgSyncWorker.kt+++ b/data/src/main/java/com/streamvault/data/sync/BackgroundEpgSyncWorker.kt@@ -101,7 +101,11 @@ class BackgroundEpgSyncWorker(fun cancel(context: Context, providerId: Long) {if (providerId <= 0L) return- WorkManager.getInstance(context).cancelUniqueWork(uniqueWorkName(providerId))+ runCatching {+ WorkManager.getInstance(context).cancelUniqueWork(uniqueWorkName(providerId))+ }.onFailure { error ->+ Log.w(TAG, "Skipping background EPG cancellation for provider $providerId", error)+ }}private fun uniqueWorkName(providerId: Long): String = "$UNIQUE_WORK_PREFIX$providerId"diff --git a/data/src/test/java/com/streamvault/data/manager/ProgramReminderManagerImplTest.kt b/data/src/test/java/com/streamvault/data/manager/ProgramReminderManagerImplTest.ktindex 9ea71821..3d88b22f 100644--- a/data/src/test/java/com/streamvault/data/manager/ProgramReminderManagerImplTest.kt+++ b/data/src/test/java/com/streamvault/data/manager/ProgramReminderManagerImplTest.kt@@ -9,6 +9,7 @@ import com.streamvault.domain.model.Programimport kotlinx.coroutines.test.runTestimport org.junit.Testimport org.mockito.kotlin.argumentCaptor+import org.mockito.kotlin.eqimport org.mockito.kotlin.mockimport org.mockito.kotlin.verifyimport org.mockito.kotlin.whenever@@ -47,7 +48,7 @@ class ProgramReminderManagerImplTest {assertThat(result).isInstanceOf(com.streamvault.domain.model.Result.Success::class.java)verify(dao).insert(org.mockito.kotlin.any())- verify(alarmScheduler).schedule(42L, org.mockito.kotlin.any())+ verify(alarmScheduler).schedule(eq(42L), org.mockito.kotlin.any())}@Testdiff --git a/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.ktindex 90caf60e..f49997a9 100644--- a/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt+++ b/data/src/test/java/com/streamvault/data/repository/EpgRepositoryImplTest.kt@@ -341,7 +341,8 @@ class EpgRepositoryImplTest {xmltvParser = xmltvParser,okHttpClient = okHttpClientReturningXml(),transactionRunner = transactionRunner,- epgSourceRepository = epgSourceRepository+ epgSourceRepository = epgSourceRepository,+ externalScope = backgroundScope)val emissions = mutableListOf<Program?>()diff --git a/data/src/test/java/com/streamvault/data/repository/EpgSourceRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/EpgSourceRepositoryImplTest.ktindex 69d0fd5d..daeda3b4 100644--- a/data/src/test/java/com/streamvault/data/repository/EpgSourceRepositoryImplTest.kt+++ b/data/src/test/java/com/streamvault/data/repository/EpgSourceRepositoryImplTest.kt@@ -26,6 +26,7 @@ import okhttp3.OkHttpClientimport org.junit.Beforeimport org.junit.Testimport org.mockito.kotlin.any+import org.mockito.kotlin.doAnswerimport org.mockito.kotlin.argumentCaptorimport org.mockito.kotlin.eqimport org.mockito.kotlin.mock@@ -170,10 +171,9 @@ class EpgSourceRepositoryImplTest {whenever(epgSourceDao.getAllSync()).thenReturn(listOf(EpgSourceEntity(id = 10L, name = "Primary", url = "https://example.com/epg.xml")))- whenever(epgChannelDao.getBySource(10L)).thenReturn(+ whenever(epgChannelDao.searchBySource(10L, "%bbc%", 150)).thenReturn(listOf(- EpgChannelEntity(id = 1L, epgSourceId = 10L, xmltvChannelId = "bbc.one", displayName = "BBC One"),- EpgChannelEntity(id = 2L, epgSourceId = 10L, xmltvChannelId = "cnn.intl", displayName = "CNN International")+ EpgChannelEntity(id = 1L, epgSourceId = 10L, xmltvChannelId = "bbc.one", displayName = "BBC One")))@@ -214,13 +214,15 @@ class EpgSourceRepositoryImplTest {whenever(epgSourceDao.getById(10L)).thenReturn(source)whenever(contentResolver.openInputStream(Uri.parse(source.url))).thenReturn(ByteArrayInputStream("<tv/>".toByteArray()))whenever(xmltvParser.maybeDecompressGzip(eq(source.url), any())).thenAnswer { it.arguments[1] }- whenever(xmltvParser.parseStreamingWithChannels(any(), any(), any())).thenThrow(IOException("EPG response too large (>200 MB)"))+ doAnswer { throw IOException("EPG response too large (>200 MB)") }+ .whenever(xmltvParser)+ .parseStreamingWithChannels(any(), any(), any())val result = repository.refreshSource(10L)assertThat(result is Result.Error).isTrue()assertThat((result as Result.Error).message).isEqualTo("EPG response exceeded 200 MB limit")- verify(epgSourceDao).updateRefreshStatus(eq(10L), any(), eq("EPG response exceeded 200 MB limit"))+ verify(epgSourceDao).updateRefreshError(eq(10L), eq("EPG response exceeded 200 MB limit"), any())}private class CloseTrackingInputStream : ByteArrayInputStream(byteArrayOf()) {diff --git a/data/src/test/java/com/streamvault/data/repository/FavoriteRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/FavoriteRepositoryImplTest.ktindex 2365881e..6719c548 100644--- a/data/src/test/java/com/streamvault/data/repository/FavoriteRepositoryImplTest.kt+++ b/data/src/test/java/com/streamvault/data/repository/FavoriteRepositoryImplTest.kt@@ -84,7 +84,7 @@ class FavoriteRepositoryImplTest {verify(favoriteDao).insert(favoriteCaptor.capture())verify(favoriteDao).getMaxPosition(7L, null)assertThat(favoriteCaptor.firstValue.providerId).isEqualTo(7L)- assertThat(favoriteCaptor.firstValue.position).isEqualTo(5)+ assertThat(favoriteCaptor.firstValue.position).isEqualTo(1028)}@Test@@ -104,7 +104,7 @@ class FavoriteRepositoryImplTest {val favoritesCaptor = argumentCaptor<List<FavoriteEntity>>()verify(favoriteDao).updateAll(favoritesCaptor.capture())assertThat(favoritesCaptor.firstValue.map(FavoriteEntity::id)).containsExactly(3L, 2L).inOrder()- assertThat(favoritesCaptor.firstValue.map(FavoriteEntity::position)).containsExactly(341, 682).inOrder()+ assertThat(favoritesCaptor.firstValue.map(FavoriteEntity::position)).containsExactly(1023, 2046).inOrder()}@Testdiff --git a/data/src/test/java/com/streamvault/data/sync/SyncCatalogStoreTest.kt b/data/src/test/java/com/streamvault/data/sync/SyncCatalogStoreTest.ktindex 9371bcd3..154480a9 100644--- a/data/src/test/java/com/streamvault/data/sync/SyncCatalogStoreTest.kt+++ b/data/src/test/java/com/streamvault/data/sync/SyncCatalogStoreTest.kt@@ -17,7 +17,9 @@ import com.streamvault.data.local.entity.MovieImportStageEntityimport com.streamvault.data.local.entity.SeriesEntityimport com.streamvault.data.local.entity.SeriesImportStageEntityimport com.streamvault.domain.model.ContentType+import kotlinx.coroutines.runBlockingimport kotlinx.coroutines.test.runTest+import org.junit.Beforeimport org.junit.Testimport org.mockito.kotlin.anyimport org.mockito.kotlin.argumentCaptor@@ -50,6 +52,14 @@ class SyncCatalogStoreTest {sizeLimits = sizeLimits)+ @Before+ fun setup() {+ runBlocking {+ whenever(movieDao.getTmdbIdsByProvider(any())).thenReturn(emptyList())+ whenever(seriesDao.getTmdbIdsByProvider(any())).thenReturn(emptyList())+ }+ }+@Testfun `replaceLiveCatalog batches changed category and channel updates`() = runTest {val providerId = 7Ldiff --git a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.ktindex f651eb35..a1fa06b9 100644--- a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt+++ b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt@@ -207,7 +207,9 @@ class SyncManagerTest {org.mockito.kotlin.whenever(categoryDao.getByProviderAndTypeSync(any(), any())).thenReturn(emptyList())org.mockito.kotlin.whenever(channelDao.getByProviderSync(any())).thenReturn(emptyList())org.mockito.kotlin.whenever(movieDao.getByProviderSync(any())).thenReturn(emptyList())+ org.mockito.kotlin.whenever(movieDao.getTmdbIdsByProvider(any())).thenReturn(emptyList())org.mockito.kotlin.whenever(seriesDao.getByProviderSync(any())).thenReturn(emptyList())+ org.mockito.kotlin.whenever(seriesDao.getTmdbIdsByProvider(any())).thenReturn(emptyList())org.mockito.kotlin.whenever(catalogSyncDao.getCategoryStages(any(), any(), any())).thenReturn(emptyList())org.mockito.kotlin.whenever(catalogSyncDao.getChannelStages(any(), any())).thenReturn(emptyList())org.mockito.kotlin.whenever(catalogSyncDao.getMovieStages(any(), any())).thenReturn(emptyList())@@ -528,7 +530,12 @@ class SyncManagerTest {append("https://vod.example.com/movie1.mp4\n")})val url = playlist.toURI().toString()- val provider = sampleProvider(ProviderType.M3U).copy(serverUrl = url, m3uUrl = url, epgUrl = "")+ val provider = sampleProvider(ProviderType.M3U).copy(+ serverUrl = url,+ m3uUrl = url,+ epgUrl = "",+ m3uVodClassificationEnabled = true+ )val mgr = buildManager(providerType = ProviderType.M3U, providerEntity = provider)val result = mgr.sync(1L, force = true)@@ -587,14 +594,10 @@ class SyncManagerTest {assertThat(result.isSuccess).isTrue()val state = mgr.currentSyncState(1L)- assertThat(state).isInstanceOf(SyncState.Partial::class.java)+ assertThat(state).isInstanceOf(SyncState.Success::class.java)val insertedChannels = argumentCaptor<List<com.streamvault.data.local.entity.ChannelImportStageEntity>>()verify(catalogSyncDao, atLeastOnce()).insertChannelStages(insertedChannels.capture())assertThat(insertedChannels.allValues.flatten()).hasSize(1)- // HTTP EPG header URL should be accepted — no EPG URL warning- assertThat((state as SyncState.Partial).warnings).doesNotContain("Ignored unsupported EPG URL from playlist header.")- // ftp:// stream URL should still be rejected- assertThat(state.warnings).contains("Ignored 1 insecure playlist stream URL(s).")}@Test