And the tests

muxinc · May 7, 2024 · 093b70c · 093b70c
1 parent 7eabea5
commit 093b70c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/Tests/MuxPlayerSwift/FairPlay/ContentKeySessionDelegateTests.swift b/Tests/MuxPlayerSwift/FairPlay/ContentKeySessionDelegateTests.swift
@@ -13,6 +13,7 @@ class ContentKeySessionDelegateTests : XCTestCase {
 
     var testPlaybackOptionsRegistry: TestPlaybackOptionsRegistry!
     var testCredentialClient: TestFairPlayStreamingSessionCredentialClient!
+    var testSessionmanager: TestFairPlayStreamingSessionManager!
 
     // object under test
     var contentKeySessionDelegate: ContentKeySessionDelegate<
@@ -28,11 +29,14 @@ class ContentKeySessionDelegateTests : XCTestCase {
             failsWith: error
         )
         testPlaybackOptionsRegistry = TestPlaybackOptionsRegistry()
-
-        contentKeySessionDelegate = ContentKeySessionDelegate(
+        testSessionmanager = TestFairPlayStreamingSessionManager(
             credentialClient: testCredentialClient,
             optionsRegistry: testPlaybackOptionsRegistry
         )
+
+        contentKeySessionDelegate = ContentKeySessionDelegate(
+            sessionManager: testSessionmanager  
+        )
     }
 
     private func setUpForSuccess() {
@@ -42,10 +46,14 @@ class ContentKeySessionDelegateTests : XCTestCase {
         )
         testPlaybackOptionsRegistry = TestPlaybackOptionsRegistry()
 
-        contentKeySessionDelegate = ContentKeySessionDelegate(
+        testSessionmanager = TestFairPlayStreamingSessionManager(
             credentialClient: testCredentialClient,
             optionsRegistry: testPlaybackOptionsRegistry
         )
+
+        contentKeySessionDelegate = ContentKeySessionDelegate(
+            sessionManager: testSessionmanager  
+        )
     }
 
     private func makeFakeSkdUrl(fakePlaybackID: String) -> String {

diff --git a/Tests/MuxPlayerSwift/Helpers/TestFairPlayStreamingSessionManager.swift b/Tests/MuxPlayerSwift/Helpers/TestFairPlayStreamingSessionManager.swift
@@ -9,20 +9,10 @@ import Foundation
 import AVFoundation
 @testable import MuxPlayerSwift
 
-// TODO: Still needed?
-class TestFairPlayStreamingSessionManager : FairPlayStreamingSessionManager {
+class TestFairPlayStreamingSessionManager : FairPlayStreamingSessionCredentialClient & PlaybackOptionsRegistry {
 
     let credentialClient: FairPlayStreamingSessionCredentialClient
     let optionsRegistry: PlaybackOptionsRegistry
-    let contentKeyRegistry: ContentKeyRecipientRegistry
-
-    func addContentKeyRecipient(_ recipient: any AVContentKeyRecipient) {
-        contentKeyRegistry.addContentKeyRecipient(recipient)
-    }
-
-    func removeContentKeyRecipient(_ recipient: any AVContentKeyRecipient) {
-        contentKeyRegistry.removeContentKeyRecipient(recipient)
-    }
 
     func requestCertificate(fromDomain rootDomain: String, playbackID: String, drmToken: String, completion requestCompletion: @escaping (Result<Data, any Error>) -> Void) {
         credentialClient.requestCertificate(fromDomain: rootDomain, playbackID: playbackID, drmToken: drmToken, completion: requestCompletion)
@@ -45,10 +35,8 @@ class TestFairPlayStreamingSessionManager : FairPlayStreamingSessionManager {
     }
 
     init(credentialClient: any FairPlayStreamingSessionCredentialClient,
-         optionsRegistry: any PlaybackOptionsRegistry,
-         contentKeyRegistry: any ContentKeyRecipientRegistry) {
+         optionsRegistry: any PlaybackOptionsRegistry) {
         self.credentialClient = credentialClient
         self.optionsRegistry = optionsRegistry
-        self.contentKeyRegistry = contentKeyRegistry
     }
 }