Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update KotlinX Coroutines to 1.8.0 #443

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Update KotlinX Coroutines to 1.8.0 #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85ec069
Update to KotlinX Coroutines 1.8.0
MGaetan89 Feb 16, 2024
8354a2d
Remove custom timeout argument to `runTest`
MGaetan89 Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jacoco = "0.8.11"
json = "20231013"
junit = "4.13.2"
kotlin = "1.9.22"
kotlinx-coroutines = "1.7.3"
kotlinx-coroutines = "1.8.0"
kotlinx-kover = "0.7.5"
kotlinx-serialization = "1.6.2"
ktor = "2.3.8"
Expand Down
21 changes: 10 additions & 11 deletions ...siness/src/androidTest/java/ch/srgssr/pillarbox/core/business/CommandersActTrackerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class CommandersActTrackerTest {
}

@Test
fun testStartEoF() = runTest(timeout = TEST_TIMEOUT) {
fun testStartEoF() = runTest {
val expected = listOf(
MediaEventType.Play.toString(),
MediaEventType.Eof.toString()
Expand All @@ -76,7 +76,7 @@ class CommandersActTrackerTest {
}

@Test
fun testPlayStop() = runTest(timeout = TEST_TIMEOUT) {
fun testPlayStop() = runTest {
val expected = listOf(
MediaEventType.Play.toString(),
MediaEventType.Stop.toString()
Expand All @@ -89,7 +89,7 @@ class CommandersActTrackerTest {
}

@Test
fun testPlaySeekPlay() = runTest(timeout = TEST_TIMEOUT) {
fun testPlaySeekPlay() = runTest {
val seekPositionMs = 2_000L
val expectedEvents = listOf(
CommandersActDelegate.Event(MediaEventType.Play.toString(), 0L),
Expand All @@ -110,7 +110,7 @@ class CommandersActTrackerTest {
* Seek event is not send but play event position should be the seek position.
*/
@Test
fun testPausePlaySeekPlay() = runTest(timeout = TEST_TIMEOUT) {
fun testPausePlaySeekPlay() = runTest {
val seekPositionMs = 2_000L
val expected = listOf(
CommandersActDelegate.Event(MediaEventType.Play.toString(), seekPositionMs.milliseconds.inWholeSeconds),
Expand All @@ -126,7 +126,7 @@ class CommandersActTrackerTest {
}

@Test
fun testPlayPauseSeekPause() = runTest(timeout = TEST_TIMEOUT) {
fun testPlayPauseSeekPause() = runTest {
val seekPositionMs = 4_000L
val expected = listOf(
MediaEventType.Play.toString(),
Expand All @@ -147,7 +147,7 @@ class CommandersActTrackerTest {

@FlakyTest(detail = "POS and UPTIME not always send due to timers")
@Test
fun testPosTime() = runTest(timeout = TEST_TIMEOUT) {
fun testPosTime() = runTest {
val expected = listOf(
MediaEventType.Pos.toString(),
MediaEventType.Pos.toString(),
Expand All @@ -165,7 +165,7 @@ class CommandersActTrackerTest {

@FlakyTest(detail = "POS and UPTIME not always send due to timers")
@Test
fun testUpTime() = runTest(timeout = TEST_TIMEOUT) {
fun testUpTime() = runTest {
val expected = listOf(
MediaEventType.Uptime.toString(),
MediaEventType.Uptime.toString(),
Expand All @@ -183,7 +183,7 @@ class CommandersActTrackerTest {

@FlakyTest(detail = "POS and UPTIME not always send due to timers")
@Test
fun testUpTimeLiveWithDvr() = runTest(timeout = TEST_TIMEOUT) {
fun testUpTimeLiveWithDvr() = runTest {
val expected = listOf(
MediaEventType.Uptime.toString(),
MediaEventType.Uptime.toString(),
Expand All @@ -200,7 +200,7 @@ class CommandersActTrackerTest {

@FlakyTest
@Test
fun testUpTimeLiveWithDvrTimeShift() = runTest(timeout = TEST_TIMEOUT) {
fun testUpTimeLiveWithDvrTimeShift() = runTest {
val seekPosition = 80.seconds
commandersActDelegate.ignorePeriodicEvents = false
launch(Dispatchers.Main) {
Expand All @@ -218,7 +218,7 @@ class CommandersActTrackerTest {
}

@Test
fun testPauseSeekPause() = runTest(timeout = TEST_TIMEOUT) {
fun testPauseSeekPause() = runTest {
val seekPositionMs = 4_000L
launch(Dispatchers.Main) {
val player = createPlayerWithUrn(LocalMediaCompositionDataSource.Vod, false)
Expand Down Expand Up @@ -301,7 +301,6 @@ class CommandersActTrackerTest {
private val UPTIME_PERIOD = 6.seconds
private val POS_PERIOD = 3.seconds
private val DELTA_PERIOD = 500.milliseconds
private val TEST_TIMEOUT = 30.seconds

private fun TCMediaEvent.isPeriodicEvent(): Boolean {
return eventType == MediaEventType.Pos || eventType == MediaEventType.Uptime
Expand Down
Loading