change span mocking after merge

getsentry · Feb 26, 2025 · 79576cd · 79576cd
1 parent 52336a6
commit 79576cd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/SentryTestUtils/Mocks/MockSentryScope.swift b/SentryTestUtils/Mocks/MockSentryScope.swift
@@ -8,18 +8,14 @@ public class MockSentryScope: Scope, SentryMockable {
     // MARK: - Mock Helpers
 
     public func clearAllMocks() {
-        mockUseSpan.clear()
+        // replace me
     }
 
     // MARK: - Mock Functions
 
-    public var mockUseSpan = MockFunction1<Void, SentrySpanCallback>()
+    // replace me
 
-    // MARK: - Overridden Functions
+    // MARK: - Override Functions
 
-    public override func useSpan(_ callback: @escaping SentrySpanCallback) {
-        mockUseSpan.call(callback, default: { arg1 in
-            super.useSpan(arg1)
-        })
-    }
+    // replace me
 }
diff --git a/SentryTestUtils/Mocks/MockSentrySpan.swift b/SentryTestUtils/Mocks/MockSentrySpan.swift
@@ -6,7 +6,11 @@ import SentryTestMock
 /// - Warning: It might be incomplete, so make sure to implement the necessary methods when writing tests.
 public class MockSentrySpan: SentrySpan, SentryMockable {
     public init() {
+        #if SENTRY_HAS_UIKIT
         super.init(context: MockSpanContext())
+        #else
+        super.init(context: MockSpanContext(), framesTracker: nil)
+        #endif
     }
 
     // MARK: - Mock Helpers

diff --git a/Tests/SentryTests/Integrations/Performance/IO/DataSentryTracingTests.swift b/Tests/SentryTests/Integrations/Performance/IO/DataSentryTracingTests.swift
@@ -70,9 +70,7 @@ class DataSentryTracingTests: XCTestCase {
 
         let mockParentSpan = MockSentrySpan()
         mockParentSpan.mockStartChildWithOperationDescription.returnValue(ioSpan)
-        mockedSentryScope.mockUseSpan.useImplementation { callback in
-            callback(mockParentSpan)
-        }
+        mockedSentryScope.span = mockParentSpan
 
         fileIOTracker.enable()
 
@@ -90,7 +88,6 @@ class DataSentryTracingTests: XCTestCase {
         XCTAssertEqual(ioSpan.startTimestamp, expectedStartTimestamp)
         XCTAssertEqual(ioSpan.timestamp, expectedEndTimestamp)
 
-        sentryExpect(mockedSentryScope.mockUseSpan).toHaveBeenCalled()
         sentryExpect(mockParentSpan.mockStartChildWithOperationDescription)
             .toHaveBeenCalledWith(
                 SentrySpanOperation.fileRead,