Skip to content

Commit 778e487

Browse files
authored
Fix: use runUntilPendingCommandsAreFullyHandled in CommandersActTrackerIntegrationTest (#603)
1 parent b58b644 commit 778e487

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class CommandersActTrackerIntegrationTest {
122122
player.playWhenReady = true
123123

124124
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_READY)
125-
TestPlayerRunHelper.playUntilStartOfMediaItem(player, 0)
125+
TestPlayerRunHelper.runUntilPendingCommandsAreFullyHandled(player)
126126

127127
player.setMediaItem(SRGMediaItemBuilder(URN_NOT_LIVE_VIDEO).build())
128128
player.playWhenReady = true
@@ -214,7 +214,7 @@ class CommandersActTrackerIntegrationTest {
214214
player.playWhenReady = true
215215

216216
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_READY)
217-
TestPlayerRunHelper.playUntilStartOfMediaItem(player, 0)
217+
TestPlayerRunHelper.runUntilPendingCommandsAreFullyHandled(player)
218218

219219
verifyOrder {
220220
commandersAct.enableRunningInBackground()
@@ -239,7 +239,7 @@ class CommandersActTrackerIntegrationTest {
239239
player.setPlaybackSpeed(2f)
240240

241241
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_READY)
242-
TestPlayerRunHelper.playUntilStartOfMediaItem(player, 0)
242+
TestPlayerRunHelper.runUntilPendingCommandsAreFullyHandled(player)
243243

244244
verifyOrder {
245245
commandersAct.enableRunningInBackground()
@@ -263,7 +263,7 @@ class CommandersActTrackerIntegrationTest {
263263
player.playWhenReady = true
264264

265265
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_READY)
266-
TestPlayerRunHelper.playUntilStartOfMediaItem(player, 0)
266+
TestPlayerRunHelper.runUntilPendingCommandsAreFullyHandled(player)
267267

268268
clock.advanceTime(5.minutes.inWholeMilliseconds)
269269
player.setPlaybackSpeed(2f)
@@ -292,7 +292,7 @@ class CommandersActTrackerIntegrationTest {
292292
player.playWhenReady = true
293293

294294
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_READY)
295-
TestPlayerRunHelper.playUntilStartOfMediaItem(player, 0)
295+
TestPlayerRunHelper.runUntilPendingCommandsAreFullyHandled(player)
296296

297297
clock.advanceTime(2.minutes.inWholeMilliseconds)
298298
player.playWhenReady = false
@@ -327,7 +327,7 @@ class CommandersActTrackerIntegrationTest {
327327
player.playWhenReady = true
328328

329329
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_READY)
330-
TestPlayerRunHelper.playUntilStartOfMediaItem(player, 0)
330+
TestPlayerRunHelper.runUntilPendingCommandsAreFullyHandled(player)
331331

332332
clock.advanceTime(2.minutes.inWholeMilliseconds)
333333
player.playWhenReady = false
@@ -373,7 +373,7 @@ class CommandersActTrackerIntegrationTest {
373373
player.playWhenReady = true
374374

375375
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_READY)
376-
TestPlayerRunHelper.playUntilStartOfMediaItem(player, 0)
376+
TestPlayerRunHelper.runUntilPendingCommandsAreFullyHandled(player)
377377

378378
clock.advanceTime(2.minutes.inWholeMilliseconds)
379379
player.stop()
@@ -621,7 +621,7 @@ class CommandersActTrackerIntegrationTest {
621621
player.playWhenReady = true
622622

623623
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_READY)
624-
TestPlayerRunHelper.playUntilStartOfMediaItem(player, 0)
624+
TestPlayerRunHelper.runUntilPendingCommandsAreFullyHandled(player)
625625

626626
clock.advanceTime(playTime.inWholeMilliseconds)
627627
advanceTimeBy(playTime)

pillarbox-core-business/src/test/java/ch/srgssr/pillarbox/core/business/tracker/comscore/ComScoreTrackerIntegrationTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ class ComScoreTrackerIntegrationTest {
359359
}
360360

361361
@Test
362-
@Ignore("Need a live DVR available outside of Switzerland")
363362
fun `live - player prepared, playing and seeking`() {
364363
player.setMediaItem(SRGMediaItemBuilder(URN_LIVE_VIDEO).build())
365364
player.prepare()
@@ -391,7 +390,6 @@ class ComScoreTrackerIntegrationTest {
391390
}
392391

393392
@Test
394-
@Ignore("Need a live DVR available outside of Switzerland")
395393
fun `live - player prepared and seek`() {
396394
player.setMediaItem(SRGMediaItemBuilder(URN_LIVE_VIDEO).build())
397395
player.prepare()

0 commit comments

Comments
 (0)