Update slot opp detector, added support for new and old cores

yahoo · Feb 3, 2019 · d82a373 · d82a373
1 parent 6a5b837
commit d82a373
Show file tree

Hide file tree

Showing 4 changed files with 149 additions and 164 deletions.
diff --git a/PlayerCore b/PlayerCore
diff --git a/sources/metrics/detectors/slot opportunity/SlotOpportunityDetector.swift b/sources/metrics/detectors/slot opportunity/SlotOpportunityDetector.swift
@@ -8,26 +8,17 @@ extension Detectors {
         var playbackInitiated = false
         var sessionID: UUID?
 
-        func process(sessionID: UUID,
-                     adPlaying: Bool,
-                     adSkipped: Bool,
-                     adFailed: Bool,
-                     contentPlaying: Bool) -> Bool {
+        func process(sessionID: UUID, playbackStarted: Bool) -> Bool {
             if self.sessionID != sessionID {
                 self.sessionID = sessionID
                 playbackInitiated = false
             }
 
-            guard playbackInitiated == false else { return false }
-            switch (adSkipped, contentPlaying, adPlaying, adFailed) {
-            case (true, true, _, false),
-                 (_, true, _, true),
-                 (false, _, true, false):
-                playbackInitiated = true
-                return true
-
-            default: return false
-            }
+            guard playbackInitiated == false,
+                playbackStarted else { return false }
+
+            playbackInitiated = true
+            return true
         }
     }
 }
diff --git a/sources/metrics/detectors/slot opportunity/SlotOpportunityDetectorTests.swift b/sources/metrics/detectors/slot opportunity/SlotOpportunityDetectorTests.swift
@@ -13,97 +13,23 @@ class SlotOpportunityDetectorTests: XCTestCase {
         sut = Detectors.SlotOpportunity()
     }
 
-    override func tearDown() {
-        sut = nil
-
-        super.tearDown()
-    }
-
-    func testAdPlayingProcess() {
-        let id = UUID()
-        var result = sut.process(sessionID: id,
-                                 adPlaying: false,
-                                 adSkipped: false,
-                                 adFailed: false,
-                                 contentPlaying: false)
-        XCTAssertFalse(result)
-        result = sut.process(sessionID: id,
-                             adPlaying: true,
-                             adSkipped: false,
-                             adFailed: false,
-                             contentPlaying: false)
-        XCTAssertTrue(result)
-
-        result = sut.process(sessionID: id,
-                             adPlaying: true,
-                             adSkipped: false,
-                             adFailed: false,
-                             contentPlaying: false)
-        XCTAssertFalse(result)
-    }
-
-    func testAdSkipProcess() {
+    func testPlayingProcess() {
         let id = UUID()
-        var result = sut.process(sessionID: id,
-                                 adPlaying: false,
-                                 adSkipped: true,
-                                 adFailed: false,
-                                 contentPlaying: false)
+        var result = sut.process(sessionID: id, playbackStarted: false)
         XCTAssertFalse(result)
 
-        result = sut.process(sessionID: id,
-                             adPlaying: false,
-                             adSkipped: true,
-                             adFailed: false,
-                             contentPlaying: true)
+        result = sut.process(sessionID: id, playbackStarted: true)
         XCTAssertTrue(result)
 
-        result = sut.process(sessionID: id,
-                             adPlaying: false,
-                             adSkipped: true,
-                             adFailed: false,
-                             contentPlaying: true)
+        result = sut.process(sessionID: id, playbackStarted: true)
         XCTAssertFalse(result)
     }
 
-    func testAdFailProcess() {
-        let id = UUID()
-        var result = sut.process(sessionID: id,
-                                 adPlaying: false,
-                                 adSkipped: false,
-                                 adFailed: true,
-                                 contentPlaying: false)
-        XCTAssertFalse(result)
-
-        result = sut.process(sessionID: id,
-                             adPlaying: false,
-                             adSkipped: false,
-                             adFailed: true,
-                             contentPlaying: true)
-        XCTAssertTrue(result)
-
-        result = sut.process(sessionID: id,
-                             adPlaying: false,
-                             adSkipped: false,
-                             adFailed: true,
-                             contentPlaying: true)
-        XCTAssertFalse(result)
-    }
-
-    func testSessionChnageProcess() {
-        let id = UUID()
-        _ = sut.process(sessionID: id,
-                        adPlaying: true,
-                        adSkipped: false,
-                        adFailed: false,
-                        contentPlaying: false)
+    func testSessionChanageProcess() {
+        _ = sut.process(sessionID: UUID(), playbackStarted: true)
         XCTAssertTrue(sut.playbackInitiated)
 
-        _ = sut.process(sessionID: UUID(),
-                        adPlaying: false,
-                        adSkipped: false,
-                        adFailed: false,
-                        contentPlaying: false)
+        _ = sut.process(sessionID: UUID(), playbackStarted: false)
         XCTAssertFalse(sut.playbackInitiated)
     }
 }