Avoid flaky expectations capturing values during a hardcoded time int…

…erval (#1099)
SRGSSR · Dec 12, 2024 · a1749bf · a1749bf
1 parent 1fe4fbc
commit a1749bf
Show file tree

Hide file tree

Showing 32 changed files with 119 additions and 156 deletions.
diff --git a/Tests/AnalyticsTests/ComScore/ComScorePageViewTests.swift b/Tests/AnalyticsTests/ComScore/ComScorePageViewTests.swift
@@ -123,14 +123,14 @@ final class ComScorePageViewTests: ComScoreTestCase {
 
     func testAutomaticTrackingWithoutProtocolImplementation() {
         let viewController = UIViewController()
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             viewController.simulateViewAppearance()
         }
     }
 
     func testManualTrackingWithoutProtocolImplementation() {
         let viewController = UIViewController()
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             viewController.trackPageView()
         }
     }
@@ -179,7 +179,7 @@ final class ComScorePageViewTests: ComScoreTestCase {
         let viewController2 = AutomaticMockViewController(title: "title2")
         let tabBarController = UITabBarController()
         tabBarController.viewControllers = [viewController1, viewController2]
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             viewController2.simulateViewAppearance()
         }
     }
@@ -209,14 +209,14 @@ final class ComScorePageViewTests: ComScoreTestCase {
             UINavigationController(rootViewController: viewController1),
             UINavigationController(rootViewController: viewController2)
         ]
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             viewController2.simulateViewAppearance()
         }
     }
 
     func testManualTracking() {
         let viewController = ManualMockViewController()
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             viewController.simulateViewAppearance()
         }
         expectAtLeastHits(

diff --git a/Tests/AnalyticsTests/ComScore/ComScoreTrackerMetadataTests.swift b/Tests/AnalyticsTests/ComScore/ComScoreTrackerMetadataTests.swift
@@ -40,7 +40,7 @@ final class ComScoreTrackerMetadataTests: ComScoreTestCase {
             ]
         ))
 
-        expectNoHits(during: .seconds(3)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.play()
         }
     }
@@ -53,7 +53,7 @@ final class ComScoreTrackerMetadataTests: ComScoreTestCase {
             ]
         ))
 
-        expectNoHits(during: .seconds(3)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.play()
         }
     }

diff --git a/Tests/AnalyticsTests/ComScore/ComScoreTrackerRateTests.swift b/Tests/AnalyticsTests/ComScore/ComScoreTrackerRateTests.swift
@@ -58,7 +58,7 @@ final class ComScoreTrackerRateTests: ComScoreTestCase {
         player.play()
         expect(player.playbackState).toEventually(equal(.playing))
 
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.setDesiredPlaybackSpeed(1)
         }
     }

diff --git a/Tests/AnalyticsTests/ComScore/ComScoreTrackerSeekTests.swift b/Tests/AnalyticsTests/ComScore/ComScoreTrackerSeekTests.swift
@@ -45,7 +45,7 @@ final class ComScoreTrackerSeekTests: ComScoreTestCase {
 
         expect(player.playbackState).toEventually(equal(.paused))
 
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.seek(at(.init(value: 7, timescale: 1)))
         }
 

diff --git a/Tests/AnalyticsTests/ComScore/ComScoreTrackerTests.swift b/Tests/AnalyticsTests/ComScore/ComScoreTrackerTests.swift
@@ -61,7 +61,7 @@ final class ComScoreTrackerTests: ComScoreTestCase {
                 ComScoreTracker.adapter { _ in .test }
             ]
         ))
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.pause()
         }
     }
@@ -132,7 +132,7 @@ final class ComScoreTrackerTests: ComScoreTestCase {
                 ComScoreTracker.adapter { _ in .test }
             ]
         ))
-        expectNoHits(during: .seconds(3)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.play()
         }
     }
@@ -163,7 +163,7 @@ final class ComScoreTrackerTests: ComScoreTestCase {
 
         player.isTrackingEnabled = false
 
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.play()
         }
 

diff --git a/Tests/AnalyticsTests/CommandersAct/CommandersActHeartbeatTests.swift b/Tests/AnalyticsTests/CommandersAct/CommandersActHeartbeatTests.swift
@@ -34,7 +34,7 @@ final class CommandersActHeartbeatTests: CommandersActTestCase {
 
     func testNoHeartbeatInitially() {
         _ = Self.player(from: .onDemand, into: &cancellables)
-        expectNoHits(during: .milliseconds(300))
+        expectNoHits(during: .milliseconds(500))
     }
 
     func testOnDemandHeartbeatAfterPlay() {
@@ -63,7 +63,7 @@ final class CommandersActHeartbeatTests: CommandersActTestCase {
         expectAtLeastHits(pos()) {
             player.play()
         }
-        expectNoHits(during: .milliseconds(300)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.pause()
         }
     }

diff --git a/Tests/AnalyticsTests/CommandersAct/CommandersActTrackerDvrPropertiesTests.swift b/Tests/AnalyticsTests/CommandersAct/CommandersActTrackerDvrPropertiesTests.swift
@@ -94,16 +94,12 @@ final class CommandersActTrackerDvrPropertiesTests: CommandersActTestCase {
                 CommandersActTracker.adapter { _ in .test }
             ]
         ))
-
-        player?.play()
-        expect(player?.playbackState).toEventually(equal(.playing))
-
-        player?.pause()
-        wait(for: .seconds(2))
-
+        expectAtLeastHits(play()) {
+            player?.play()
+        }
         expectAtLeastHits(
             stop { labels in
-                expect(labels.media_position).to(equal(0))
+                expect(labels.media_position).notTo(beNil())
             }
         ) {
             player = nil
@@ -119,7 +115,7 @@ final class CommandersActTrackerDvrPropertiesTests: CommandersActTestCase {
         ))
         expect(player?.playbackState).toEventually(equal(.paused))
 
-        expectNoHits(during: .seconds(5)) {
+        expectNoHits(during: .milliseconds(500)) {
             player = nil
         }
     }

diff --git a/Tests/AnalyticsTests/CommandersAct/CommandersActTrackerSeekTests.swift b/Tests/AnalyticsTests/CommandersAct/CommandersActTrackerSeekTests.swift
@@ -44,7 +44,7 @@ final class CommandersActTrackerSeekTests: CommandersActTestCase {
 
         expect(player.playbackState).toEventually(equal(.paused))
 
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.seek(at(.init(value: 7, timescale: 1)))
         }
 

diff --git a/Tests/AnalyticsTests/CommandersAct/CommandersActTrackerTests.swift b/Tests/AnalyticsTests/CommandersAct/CommandersActTrackerTests.swift
@@ -34,7 +34,7 @@ final class CommandersActTrackerTests: CommandersActTestCase {
                 CommandersActTracker.adapter { _ in [:] }
             ]
         ))
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.pause()
         }
     }
@@ -129,7 +129,7 @@ final class CommandersActTrackerTests: CommandersActTestCase {
             player?.play()
         }
 
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             player = nil
         }
     }
@@ -141,7 +141,7 @@ final class CommandersActTrackerTests: CommandersActTestCase {
                 CommandersActTracker.adapter { _ in [:] }
             ]
         ))
-        expectNoHits(during: .seconds(3)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.play()
         }
     }
@@ -172,7 +172,7 @@ final class CommandersActTrackerTests: CommandersActTestCase {
 
         player.isTrackingEnabled = false
 
-        expectNoHits(during: .seconds(2)) {
+        expectNoHits(during: .milliseconds(500)) {
             player.play()
         }
 

diff --git a/Tests/CoreTests/DispatchPublisherTests.swift b/Tests/CoreTests/DispatchPublisherTests.swift
@@ -81,13 +81,13 @@ final class DispatchPublisherTests: XCTestCase {
         let delayedPublisher = [1, 2, 3].publisher
             .delayIfNeeded(for: 0.1, scheduler: DispatchQueue.main)
         let subject = CurrentValueSubject<Int, Never>(0)
-        expectEqualPublished(values: [0, 1, 2, 3], from: Publishers.Merge(delayedPublisher, subject), during: .milliseconds(100))
+        expectAtLeastEqualPublished(values: [0, 1, 2, 3], from: Publishers.Merge(delayedPublisher, subject))
     }
 
     func testDelayIfNeededOutputOrderingWithZeroDelay() {
         let delayedPublisher = [1, 2, 3].publisher
             .delayIfNeeded(for: 0, scheduler: DispatchQueue.main)
         let subject = CurrentValueSubject<Int, Never>(0)
-        expectEqualPublished(values: [1, 2, 3, 0], from: Publishers.Merge(delayedPublisher, subject), during: .milliseconds(100))
+        expectAtLeastEqualPublished(values: [1, 2, 3, 0], from: Publishers.Merge(delayedPublisher, subject))
     }
 }
diff --git a/Tests/CoreTests/MeasurePublisherTests.swift b/Tests/CoreTests/MeasurePublisherTests.swift
@@ -16,15 +16,15 @@ final class MeasurePublisherTests: XCTestCase {
             .delay(for: .milliseconds(500), scheduler: DispatchQueue.main)
             .measureDateInterval()
             .map(\.duration)
-        expectPublished(values: [0.5], from: publisher, to: beClose(within: 0.1), during: .seconds(1))
+        expectAtLeastPublished(values: [0.5], from: publisher, to: beClose(within: 0.1))
     }
 
     func testWithMultipleEvents() {
         let publisher = [1, 2].publisher
             .delay(for: .milliseconds(500), scheduler: DispatchQueue.main)
             .measureDateInterval()
             .map(\.duration)
-        expectPublished(values: [0.5, 0], from: publisher, to: beClose(within: 0.1), during: .seconds(1))
+        expectAtLeastPublished(values: [0.5, 0], from: publisher, to: beClose(within: 0.1))
     }
 
     func testWithoutEvents() {

diff --git a/Tests/CoreTests/ReplaySubjectTests.swift b/Tests/CoreTests/ReplaySubjectTests.swift
@@ -33,13 +33,13 @@ final class ReplaySubjectTests: XCTestCase {
         subject.send(1)
         subject.send(2)
         subject.send(3)
-        expectEqualPublished(values: [2, 3], from: subject, during: .milliseconds(100))
+        expectAtLeastEqualPublished(values: [2, 3], from: subject)
     }
 
     func testNewValuesWithBufferOfZero() {
         let subject = ReplaySubject<Int, Never>(bufferSize: 0)
         subject.send(1)
-        expectEqualPublished(values: [2, 3], from: subject, during: .milliseconds(100)) {
+        expectAtLeastEqualPublished(values: [2, 3], from: subject) {
             subject.send(2)
             subject.send(3)
         }
@@ -50,7 +50,7 @@ final class ReplaySubjectTests: XCTestCase {
         subject.send(1)
         subject.send(2)
         subject.send(3)
-        expectEqualPublished(values: [2, 3, 4, 5], from: subject, during: .milliseconds(100)) {
+        expectAtLeastEqualPublished(values: [2, 3, 4, 5], from: subject) {
             subject.send(4)
             subject.send(5)
         }
@@ -61,8 +61,8 @@ final class ReplaySubjectTests: XCTestCase {
         subject.send(1)
         subject.send(2)
         subject.send(3)
-        expectEqualPublished(values: [2, 3], from: subject, during: .milliseconds(100))
-        expectEqualPublished(values: [2, 3], from: subject, during: .milliseconds(100))
+        expectAtLeastEqualPublished(values: [2, 3], from: subject)
+        expectAtLeastEqualPublished(values: [2, 3], from: subject)
     }
 
     func testSubscriptionRelease() {
@@ -79,10 +79,10 @@ final class ReplaySubjectTests: XCTestCase {
         subject.send(1)
         subject.send(2)
         subject.send(3)
-        expectEqualPublished(values: [2, 3, 4], from: subject, during: .milliseconds(100)) {
+        expectAtLeastEqualPublished(values: [2, 3, 4], from: subject) {
             subject.send(4)
         }
-        expectEqualPublished(values: [3, 4], from: subject, during: .milliseconds(100))
+        expectAtLeastEqualPublished(values: [3, 4], from: subject)
     }
 
     func testCompletion() {
@@ -98,7 +98,7 @@ final class ReplaySubjectTests: XCTestCase {
         subject.send(1)
         subject.send(completion: .finished)
         subject.send(2)
-        expectEqualPublished(values: [1], from: subject, during: .milliseconds(100))
+        expectAtLeastEqualPublished(values: [1], from: subject)
     }
 
     func testCompletionWithMultipleSubscribers() {

diff --git a/Tests/CoreTests/SlicePublisherTests.swift b/Tests/CoreTests/SlicePublisherTests.swift
@@ -22,6 +22,6 @@ final class SlicePublisherTests: XCTestCase {
             Person(firstName: "Jane", lastName: "Smith"),
             Person(firstName: "John", lastName: "Bridges")
         ].publisher.slice(at: \.firstName)
-        expectEqualPublished(values: ["Jane", "John"], from: publisher, during: .milliseconds(100))
+        expectAtLeastEqualPublished(values: ["Jane", "John"], from: publisher)
     }
 }
diff --git a/Tests/CoreTests/TriggerTests.swift b/Tests/CoreTests/TriggerTests.swift
@@ -40,7 +40,7 @@ final class TriggerTests: XCTestCase {
 
     func testHashableActivationIndex() {
         let trigger = Trigger()
-        expectEqualPublished(values: ["out"], from: trigger.signal(activatedBy: "index").map { _ in "out" }, during: .seconds(1)) {
+        expectAtLeastEqualPublished(values: ["out"], from: trigger.signal(activatedBy: "index").map { _ in "out" }) {
             trigger.activate(for: "index")
         }
     }

diff --git a/Tests/CoreTests/WaitPublisherTests.swift b/Tests/CoreTests/WaitPublisherTests.swift
@@ -18,7 +18,7 @@ final class WaitPublisherTests: XCTestCase {
             .wait(untilOutputFrom: signal)
         expectNothingPublished(from: publisher, during: .milliseconds(100))
 
-        expectEqualPublished(values: ["Received"], from: publisher, during: .milliseconds(100)) {
+        expectAtLeastEqualPublished(values: ["Received"], from: publisher) {
             signal.send(())
         }
     }

diff --git a/Tests/PlayerTests/Asset/ResourceItemTests.swift b/Tests/PlayerTests/Asset/ResourceItemTests.swift
@@ -32,10 +32,9 @@ final class ResourceItemTests: TestCase {
     func testFailingPlayerItem() {
         let item = Resource.failing(error: StructError()).playerItem(configuration: .default, limits: .none)
         _ = AVPlayer(playerItem: item)
-        expectEqualPublished(
+        expectAtLeastEqualPublished(
             values: [.unknown],
-            from: item.statusPublisher(),
-            during: .seconds(1)
+            from: item.statusPublisher()
         )
     }
 }
diff --git a/Tests/PlayerTests/Player/ErrorTests.swift b/Tests/PlayerTests/Player/ErrorTests.swift
@@ -34,10 +34,9 @@ final class ErrorTests: TestCase {
 
     func testInvalidStream() {
         let player = Player(item: .simple(url: Stream.unavailable.url))
-        expectEqualPublishedNext(
+        expectAtLeastEqualPublishedNext(
             values: [.init(rawValue: NSURLErrorFileDoesNotExist)],
-            from: Self.errorCodePublisher(for: player),
-            during: .seconds(1)
+            from: Self.errorCodePublisher(for: player)
         )
     }
 

diff --git a/Tests/PlayerTests/Player/PlaybackTests.swift b/Tests/PlayerTests/Player/PlaybackTests.swift
@@ -39,10 +39,9 @@ final class PlaybackTests: XCTestCase {
     func testUnknown() {
         let item = PlayerItem.simple(url: Stream.unavailable.url)
         let player = Player(item: item)
-        expectEqualPublished(
+        expectAtLeastEqualPublished(
             values: [.idle],
-            from: playbackStatePublisher(for: player),
-            during: .seconds(1)
+            from: playbackStatePublisher(for: player)
         )
     }
 }
diff --git a/Tests/PlayerTests/Player/PlayerTests.swift b/Tests/PlayerTests/Player/PlayerTests.swift
@@ -45,10 +45,9 @@ final class PlayerTests: TestCase {
     func testRetrieveCurrentValueOnSubscription() {
         let player = Player(item: .simple(url: Stream.onDemand.url))
         expect(player.properties.isBuffering).toEventually(beFalse())
-        expectEqualPublished(
+        expectAtLeastEqualPublished(
             values: [false],
-            from: player.propertiesPublisher.slice(at: \.isBuffering),
-            during: .seconds(1)
+            from: player.propertiesPublisher.slice(at: \.isBuffering)
         )
     }