Skip to content

Commit 869d686

Browse files
authored
Cherry-pick test changes from #615 (#620)
1 parent a65b2f8 commit 869d686

File tree

7 files changed

+20
-2
lines changed

7 files changed

+20
-2
lines changed

pillarbox-core-business/src/test/java/ch/srgssr/pillarbox/core/business/tracker/commandersact/CommandersActTrackerIntegrationTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ class CommandersActTrackerIntegrationTest {
409409
assertEquals(Stop, it.eventType)
410410
assertTrue(it.assets.isNotEmpty())
411411
assertNull(it.sourceId)
412-
assertEquals(position, it.mediaPosition)
412+
assertEquals(position.inWholeMinutes, it.mediaPosition.inWholeMinutes)
413413
}
414414

415415
tcMediaEvents[1].let {
@@ -450,7 +450,7 @@ class CommandersActTrackerIntegrationTest {
450450
assertEquals(Stop, it.eventType)
451451
assertTrue(it.assets.isNotEmpty())
452452
assertNull(it.sourceId)
453-
assertEquals(position, it.mediaPosition)
453+
assertEquals(position.inWholeMinutes, it.mediaPosition.inWholeMinutes)
454454
}
455455

456456
tcMediaEvents[1].let {

pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/PlayerCallbackFlowTest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package ch.srgssr.pillarbox.player
66

77
import android.content.Context
8+
import android.os.Looper
89
import androidx.media3.common.C
910
import androidx.media3.common.MediaItem
1011
import androidx.media3.common.Player
@@ -17,6 +18,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
1718
import app.cash.turbine.test
1819
import kotlinx.coroutines.test.runTest
1920
import org.junit.runner.RunWith
21+
import org.robolectric.Shadows.shadowOf
2022
import kotlin.test.AfterTest
2123
import kotlin.test.BeforeTest
2224
import kotlin.test.Test
@@ -45,6 +47,7 @@ class PlayerCallbackFlowTest {
4547
@AfterTest
4648
fun tearDown() {
4749
player.release()
50+
shadowOf(Looper.getMainLooper()).idle()
4851
}
4952

5053
@Test

pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/TestPillarboxExoPlayerPlaybackSpeed.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package ch.srgssr.pillarbox.player
66

77
import android.content.Context
8+
import android.os.Looper
89
import androidx.media3.common.C
910
import androidx.media3.common.MediaItem
1011
import androidx.media3.common.Player
@@ -20,6 +21,7 @@ import org.junit.Assert
2021
import org.junit.Before
2122
import org.junit.Test
2223
import org.junit.runner.RunWith
24+
import org.robolectric.Shadows.shadowOf
2325

2426
@RunWith(AndroidJUnit4::class)
2527
class TestPillarboxExoPlayerPlaybackSpeed {
@@ -37,6 +39,7 @@ class TestPillarboxExoPlayerPlaybackSpeed {
3739
@After
3840
fun releasePlayer() {
3941
player.release()
42+
shadowOf(Looper.getMainLooper()).idle()
4043
}
4144

4245
@Test

pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/tracker/BlockedTimeRangeTrackerTest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package ch.srgssr.pillarbox.player.tracker
66

77
import android.content.Context
8+
import android.os.Looper
89
import androidx.media3.common.MediaItem
910
import androidx.media3.common.Player
1011
import androidx.media3.exoplayer.DefaultLoadControl
@@ -25,6 +26,7 @@ import io.mockk.spyk
2526
import io.mockk.verify
2627
import io.mockk.verifyOrder
2728
import org.junit.runner.RunWith
29+
import org.robolectric.Shadows.shadowOf
2830
import kotlin.test.AfterTest
2931
import kotlin.test.BeforeTest
3032
import kotlin.test.Test
@@ -60,6 +62,7 @@ class BlockedTimeRangeTrackerTest {
6062
fun releasePlayer() {
6163
player.removeListener(listener)
6264
player.release()
65+
shadowOf(Looper.getMainLooper()).idle()
6366
clearAllMocks()
6467
}
6568

pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/tracker/ChapterTrackerTest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package ch.srgssr.pillarbox.player.tracker
66

77
import android.content.Context
8+
import android.os.Looper
89
import androidx.media3.common.MediaItem
910
import androidx.media3.common.MediaMetadata
1011
import androidx.media3.common.Player
@@ -26,6 +27,7 @@ import io.mockk.spyk
2627
import io.mockk.verify
2728
import io.mockk.verifyOrder
2829
import org.junit.runner.RunWith
30+
import org.robolectric.Shadows.shadowOf
2931
import kotlin.test.AfterTest
3032
import kotlin.test.BeforeTest
3133
import kotlin.test.Test
@@ -60,6 +62,7 @@ class ChapterTrackerTest {
6062
fun releasePlayer() {
6163
player.removeListener(listener)
6264
player.release()
65+
shadowOf(Looper.getMainLooper()).idle()
6366
clearAllMocks()
6467
}
6568

pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/tracker/CurrentMediaItemPillarboxDataTrackerTest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package ch.srgssr.pillarbox.player.tracker
66

77
import android.content.Context
8+
import android.os.Looper
89
import androidx.media3.common.Player
910
import androidx.media3.exoplayer.ExoPlayer
1011
import androidx.media3.test.utils.FakeClock
@@ -18,6 +19,7 @@ import io.mockk.confirmVerified
1819
import io.mockk.mockk
1920
import io.mockk.verifyOrder
2021
import org.junit.runner.RunWith
22+
import org.robolectric.Shadows.shadowOf
2123
import kotlin.test.AfterTest
2224
import kotlin.test.BeforeTest
2325
import kotlin.test.Test
@@ -49,6 +51,7 @@ class CurrentMediaItemPillarboxDataTrackerTest {
4951
@AfterTest
5052
fun tearDown() {
5153
player.release()
54+
shadowOf(Looper.getMainLooper()).idle()
5255
}
5356

5457
@Test

pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/tracker/MediaItemTrackerTest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package ch.srgssr.pillarbox.player.tracker
66

77
import android.content.Context
8+
import android.os.Looper
89
import androidx.media3.common.MediaMetadata
910
import androidx.media3.common.Player
1011
import androidx.media3.exoplayer.DefaultLoadControl
@@ -26,6 +27,7 @@ import io.mockk.verifyOrder
2627
import org.junit.After
2728
import org.junit.Before
2829
import org.junit.runner.RunWith
30+
import org.robolectric.Shadows.shadowOf
2931
import kotlin.test.Test
3032
import kotlin.test.assertNotNull
3133

@@ -57,6 +59,7 @@ class MediaItemTrackerTest {
5759
fun releasePlayer() {
5860
clearAllMocks()
5961
player.release()
62+
shadowOf(Looper.getMainLooper()).idle()
6063
}
6164

6265
@Test

0 commit comments

Comments
 (0)