Skip to content

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

fix: resolve domain test regressions

David Nashashc23812390064
diff --git a/domain/src/main/java/com/streamvault/domain/model/Program.kt b/domain/src/main/java/com/streamvault/domain/model/Program.kt
index aabed4fd..1f07de74 100644
--- a/domain/src/main/java/com/streamvault/domain/model/Program.kt
+++ b/domain/src/main/java/com/streamvault/domain/model/Program.kt
@@ -20,7 +20,8 @@ data class Program(
get() = ((endTime - startTime) / 60000).toInt()
fun progressPercent(currentTimeMillis: Long = System.currentTimeMillis()): Float {
- if (endTime <= startTime || currentTimeMillis < startTime || currentTimeMillis >= endTime) return 0f
+ if (endTime <= startTime || currentTimeMillis < startTime) return 0f
+ if (currentTimeMillis >= endTime) return 1f
return ((currentTimeMillis - startTime).toFloat() / (endTime - startTime).toFloat()).coerceIn(0f, 1f)
}
}
diff --git a/domain/src/main/java/com/streamvault/domain/usecase/GetRecommendations.kt b/domain/src/main/java/com/streamvault/domain/usecase/GetRecommendations.kt
index 86b7c438..7a89e7c6 100644
--- a/domain/src/main/java/com/streamvault/domain/usecase/GetRecommendations.kt
+++ b/domain/src/main/java/com/streamvault/domain/usecase/GetRecommendations.kt
@@ -6,6 +6,7 @@ import com.streamvault.domain.util.shouldRethrowDomainFlowFailure
import java.util.logging.Level
import java.util.logging.Logger
import javax.inject.Inject
+import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.flatMapLatest
@@ -17,6 +18,7 @@ class GetRecommendations @Inject constructor(
) {
private val logger = Logger.getLogger("GetRecommendations")
+ @OptIn(ExperimentalCoroutinesApi::class)
operator fun invoke(providerId: Long, limit: Int = 12): Flow<List<Movie>> {
return movieRepository.getRecommendations(providerId, limit)
.flatMapLatest { recommended ->
diff --git a/domain/src/test/java/com/streamvault/domain/model/ProgramTest.kt b/domain/src/test/java/com/streamvault/domain/model/ProgramTest.kt
index a2de8756..698504d5 100644
--- a/domain/src/test/java/com/streamvault/domain/model/ProgramTest.kt
+++ b/domain/src/test/java/com/streamvault/domain/model/ProgramTest.kt
@@ -34,7 +34,7 @@ class ProgramTest {
}
@Test
- fun `progressPercent - not now playing returns 0`() {
+ fun `progressPercent - ignores isNowPlaying and uses timestamps`() {
val program = Program(
channelId = "ch1",
title = "Test",
@@ -42,7 +42,7 @@ class ProgramTest {
startTime = 0L,
endTime = 100000L
)
- assertThat(program.progressPercent(50000L)).isEqualTo(0f)
+ assertThat(program.progressPercent(50000L)).isEqualTo(0.5f)
}
@Test
diff --git a/domain/src/test/java/com/streamvault/domain/usecase/GetCustomCategoriesTest.kt b/domain/src/test/java/com/streamvault/domain/usecase/GetCustomCategoriesTest.kt
index d274039d..9db71aab 100644
--- a/domain/src/test/java/com/streamvault/domain/usecase/GetCustomCategoriesTest.kt
+++ b/domain/src/test/java/com/streamvault/domain/usecase/GetCustomCategoriesTest.kt
@@ -63,6 +63,7 @@ class GetCustomCategoriesTest {
}
)
+ @Deprecated("Use getFavorites(providerId, contentType) instead")
override fun getAllFavorites(providerId: Long, contentType: ContentType): Flow<List<Favorite>> =
getFavorites(providerId, contentType)
diff --git a/domain/src/test/java/com/streamvault/domain/usecase/ValidateAndAddProviderTest.kt b/domain/src/test/java/com/streamvault/domain/usecase/ValidateAndAddProviderTest.kt
index a0880d9b..7adf2c19 100644
--- a/domain/src/test/java/com/streamvault/domain/usecase/ValidateAndAddProviderTest.kt
+++ b/domain/src/test/java/com/streamvault/domain/usecase/ValidateAndAddProviderTest.kt
@@ -114,7 +114,7 @@ class ValidateAndAddProviderTest {
url = "file://playlist.m3u",
name = "Local Playlist",
epgSyncMode = ProviderEpgSyncMode.SKIP,
- m3uVodClassificationEnabled = true,
+ m3uVodClassificationEnabled = false,
id = 11L
)
)