RUM-6263 Clean up

DataDog · Oct 21, 2024 · 2c0baea · 2c0baea
1 parent e0ac222
commit 2c0baea
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 49 deletions.
diff --git a/DatadogSessionReplay/Sources/Recorder/RecordingCoordinator.swift b/DatadogSessionReplay/Sources/Recorder/RecordingCoordinator.swift
@@ -7,7 +7,6 @@
 #if os(iOS)
 import Foundation
 import DatadogInternal
-import UIKit
 
 /// Object is responsible for getting the RUM context, randomising the sampling rate,
 /// managing the recording state, starting/stopping the recording,

diff --git a/DatadogSessionReplay/Sources/Recorder/RecordingTrigger.swift b/DatadogSessionReplay/Sources/Recorder/RecordingTrigger.swift
@@ -3,6 +3,8 @@
  * This product includes software developed at Datadog (https://www.datadoghq.com/).
  * Copyright 2019-Present Datadog, Inc.
  */
+
+#if os(iOS)
 import DatadogInternal
 import UIKit
 
@@ -57,3 +59,4 @@ internal class RecordingTrigger: UIViewHandler, UIEventHandler {
         recordingCoordinator?.captureNextRecord()
     }
 }
+#endif
diff --git a/DatadogSessionReplay/Sources/Recorder/UIViewSwizzler.swift b/DatadogSessionReplay/Sources/Recorder/UIViewSwizzler.swift
@@ -4,6 +4,7 @@
  * Copyright 2019-Present Datadog, Inc.
  */
 
+#if os(iOS)
 import UIKit
 import DatadogInternal
 
@@ -53,3 +54,4 @@ internal class UIViewSwizzler {
         }
     }
 }
+#endif
diff --git a/DatadogSessionReplay/Tests/Mocks/RecordingCoordinatorSpy.swift b/DatadogSessionReplay/Tests/Mocks/RecordingCoordinatorSpy.swift
@@ -1,11 +1,10 @@
-//
-//  RecordingCoordinatorSpy.swift
-//  Datadog
-//
-//  Created by Maciej Burda on 08/10/2024.
-//  Copyright © 2024 Datadog. All rights reserved.
-//
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
 
+#if os(iOS)
 @testable import DatadogSessionReplay
 
 class RecordingCoordinatorSpy: RecordingCoordinating {
@@ -28,3 +27,4 @@ class RecordingCoordinatorSpy: RecordingCoordinating {
         captureNextRecordCalledCount += 1
     }
 }
+#endif
diff --git a/DatadogSessionReplay/Tests/Recorder/RecordingCoordinatorTests.swift b/DatadogSessionReplay/Tests/Recorder/RecordingCoordinatorTests.swift
@@ -20,7 +20,7 @@ class RecordingCoordinatorTests: XCTestCase {
     private lazy var contextPublisher: SRContextPublisher = {
         SRContextPublisher(core: core)
     }()
-    private let queue = TestSyncQueue()
+    private let queue = NoQueue()
 
     override func setUpWithError() throws {
         core = PassthroughCoreMock()
@@ -188,33 +188,6 @@ class RecordingCoordinatorTests: XCTestCase {
         XCTAssertEqual(recordingMock.captureNextRecordCallsCount, 1)
     }
 
-    func test_whenStartRecordingImmediatelyIsTrue_itShouldRecord() throws {
-        // Given
-        prepareRecordingCoordinator(startRecordingImmediately: true)
-
-        // When
-        let rumContext = RUMContext.mockRandom()
-        rumContextObserver.notify(rumContext: rumContext)
-        recordingCoordinator?.captureNextRecord()
-
-        // Then
-        XCTAssertEqual(try core.context.baggages["sr_has_replay"]?.decode(), true)
-        XCTAssertEqual(recordingMock.captureNextRecordCallsCount, 1)
-    }
-
-    func test_whenStartRecordingImmediatelyIsFalse_shouldNotRecord() throws {
-        // Given
-        prepareRecordingCoordinator(startRecordingImmediately: false)
-
-        // When
-        let rumContext = RUMContext.mockRandom()
-        rumContextObserver.notify(rumContext: rumContext)
-
-        // Then
-        XCTAssertEqual(try core.context.baggages["sr_has_replay"]?.decode(), false)
-        XCTAssertEqual(recordingMock.captureNextRecordCallsCount, 0)
-    }
-
     // MARK: Start / Stop API Tests
 
     func test_whenStopRecording_shouldStopRecord() throws {
@@ -264,8 +237,7 @@ class RecordingCoordinatorTests: XCTestCase {
         imagePrivacy: ImagePrivacyLevel = .maskNonBundledOnly,
         touchPrivacy: TouchPrivacyLevel = .show,
         telemetry: Telemetry = NOPTelemetry(),
-        methodCallTelemetrySamplingRate: Float = 0,
-        startRecordingImmediately: Bool = true
+        methodCallTelemetrySamplingRate: Float = 0
     ) {
         recordingCoordinator = RecordingCoordinator(
             textAndInputPrivacy: textAndInputPrivacy,
@@ -276,7 +248,6 @@ class RecordingCoordinatorTests: XCTestCase {
             recorder: recordingMock,
             sampler: sampler,
             telemetry: telemetry,
-            startRecordingImmediately: startRecordingImmediately,
             methodCallTelemetrySamplingRate: methodCallTelemetrySamplingRate,
             queue: queue
         )
@@ -301,10 +272,4 @@ final class RecordingMock: Recording {
         try captureNextRecordClosure?(recorderContext)
     }
 }
-
-final class TestSyncQueue: Queue {
-    func run(_ block: @escaping () -> Void) {
-        block()
-    }
-}
 #endif
diff --git a/DatadogSessionReplay/Tests/Recorder/RecordingTriggerTests.swift b/DatadogSessionReplay/Tests/Recorder/RecordingTriggerTests.swift
@@ -4,6 +4,7 @@
  * Copyright 2019-Present Datadog, Inc.
  */
 
+#if os(iOS)
 import XCTest
 @testable import DatadogSessionReplay
 
@@ -67,7 +68,7 @@ class RecordingTriggerTests: XCTestCase {
         XCTAssertEqual(recordingCoordinatorSpy.captureNextRecordCalledCount, 0)
     }
 
-    func testStartsWatchingImmediately() {
+    func testStartsWatchingImmediately() throws {
         recordingCoordinatorSpy = RecordingCoordinatorSpy()
         recordingTrigger = try RecordingTrigger(
             recordingCoordinator: recordingCoordinatorSpy,
@@ -88,3 +89,4 @@ class RecordingTriggerTests: XCTestCase {
         }
     }
 }
+#endif
diff --git a/DatadogSessionReplay/Tests/Recorder/UIViewSwizzlerTests.swift b/DatadogSessionReplay/Tests/Recorder/UIViewSwizzlerTests.swift
@@ -6,11 +6,9 @@
 
 #if os(iOS)
 import XCTest
-//@testable import DatadogInternal
-//@_spi(Internal)
 @testable import DatadogSessionReplay
 
-class UIApplicationSwizzlerTests: XCTestCase {
+class UIViewSwizzlerTests: XCTestCase {
     private let handler = UIViewHandlerMock()
     private lazy var swizzler = try! UIViewSwizzler(handler: handler)