chore: clean up tests (#2484)

Sentry.xcodeproj/xcshareddata/xcschemes/Sentry.xcscheme

@@ -76,6 +76,9 @@
                <Test
                   Identifier = "SentryOutOfMemoryIntegrationTests/testANRDetected_UpdatesAppStateToTrue_disabled()">
                </Test>
+               <Test
+                  Identifier = "SentryProfilerSwiftTests/testProfileTimeoutTimer_disabled()">
+               </Test>
                <Test
                   Identifier = "SentrySDKIntegrationTestsBase">
                </Test>

Sources/Sentry/SentryFileManager.m

@@ -77,7 +77,6 @@ - (nullable instancetype)initWithOptions:(SentryOptions *)options
         self.currentFileCounter = 0;
         self.maxEnvelopes = options.maxCacheItems;
 
-        SENTRY_LOG_DEBUG(@"Dispatching deletion of old envelopes from %@", self);
         [dispatchQueueWrapper
             dispatchAfter:10
                     block:^{

Tests/SentryTests/Helper/SentryFileManagerTests.swift

@@ -30,8 +30,7 @@ class SentryFileManagerTests: XCTestCase {
         init() {
             currentDateProvider = TestCurrentDateProvider()
             dispatchQueueWrapper = TestSentryDispatchQueueWrapper()
-            dispatchQueueWrapper.dispatchAfterExecutesBlock = true
-
+
             eventIds = (0...(maxCacheItems + 10)).map { _ in SentryId() }
 
             options = Options()
@@ -135,6 +134,8 @@ class SentryFileManagerTests: XCTestCase {
     }
 
     func testDeleteOldEnvelopes() throws {
+        fixture.dispatchQueueWrapper.dispatchAfterExecutesBlock = true
+
         let envelope = TestConstants.envelope
         let path = sut.store(envelope)
 
@@ -147,6 +148,8 @@ class SentryFileManagerTests: XCTestCase {
         sut = fixture.getSut()
 
         XCTAssertEqual(sut.getAllEnvelopes().count, 0)
+
+        fixture.dispatchQueueWrapper.dispatchAfterExecutesBlock = false
     }
 
     func testDontDeleteYoungEnvelopes() throws {

Tests/SentryTests/Networking/TestSentryDispatchQueueWrapper.swift

@@ -9,9 +9,6 @@ class TestSentryDispatchQueueWrapper: SentryDispatchQueueWrapper {
     /// - SeeAlso: `delayDispatches`, which controls whether the block should execute immediately or with the requested delay.
     var dispatchAfterExecutesBlock = false
 
-    /// If `true`, delay dispatched block execution by the specified duration. Be sure to set expectations in test code that relies on delayed dispatches.
-    var delayDispatches = false
-
     override func dispatchAsync(_ block: @escaping () -> Void) {
         dispatchAsyncCalled += 1
         block()
@@ -39,11 +36,7 @@ class TestSentryDispatchQueueWrapper: SentryDispatchQueueWrapper {
         dispatchAfterInvocations.record((interval, block))
         if blockBeforeMainBlock() {
             if dispatchAfterExecutesBlock {
-                if delayDispatches {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + interval, execute: .init(block: block))
-                } else {
-                    block()
-                }
+                block()
             }
         }
     }

Tests/SentryTests/Profiling/SentryProfilerSwiftTests.swift

@@ -117,7 +117,7 @@ class SentryProfilerSwiftTests: XCTestCase {
         }
     }
 
-    func testProfileTimeoutTimer() {
+    func testProfileTimeoutTimer_disabled() {
         fixture.options.profilesSampleRate = 1.0
         fixture.options.tracesSampleRate = 1.0
         performTest(shouldTimeOut: true)