test: clear test state in tests using SentryDependencyContainer (#3378)

getsentry · Nov 6, 2023 · 282cc99 · 282cc99
1 parent bbcbaff
commit 282cc99
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/Tests/SentryTests/Helper/SentryAppStateManagerTests.swift b/Tests/SentryTests/Helper/SentryAppStateManagerTests.swift
@@ -46,6 +46,7 @@ class SentryAppStateManagerTests: XCTestCase {
     override func tearDown() {
         super.tearDown()
         fixture.fileManager.deleteAppState()
+        clearTestState()
     }
 
     func testStartStoresAppState() {

diff --git a/Tests/SentryTests/Helper/SentryFileManagerTests.swift b/Tests/SentryTests/Helper/SentryFileManagerTests.swift
@@ -94,6 +94,7 @@ class SentryFileManagerTests: XCTestCase {
         sut.deleteAllFolders()
         sut.deleteTimestampLastInForeground()
         sut.deleteAppState()
+        clearTestState()
     }
 
     func testInitDoesNotOverrideDirectories() {

diff --git a/Tests/SentryTests/Helper/SentryLogTests.swift b/Tests/SentryTests/Helper/SentryLogTests.swift
@@ -1,3 +1,4 @@
+import SentryTestUtils
 import XCTest
 
 class SentryLogTests: XCTestCase {

diff --git a/Tests/SentryTests/Integrations/ANR/SentryANRTrackerTests.swift b/Tests/SentryTests/Integrations/ANR/SentryANRTrackerTests.swift
@@ -45,6 +45,7 @@ class SentryANRTrackerTests: XCTestCase, SentryANRTrackerDelegate {
 
         wait(for: [fixture.threadWrapper.threadFinishedExpectation], timeout: 5)
         XCTAssertEqual(0, fixture.threadWrapper.threads.count)
+        clearTestState()
     }
 
     func start() {

diff --git a/...ts/Integrations/Performance/AppStartTracking/SentryAppStartTrackingIntegrationTests.swift b/...ts/Integrations/Performance/AppStartTracking/SentryAppStartTrackingIntegrationTests.swift
@@ -30,6 +30,7 @@ class SentryAppStartTrackingIntegrationTests: NotificationCenterTestCase {
         fixture = Fixture()
         SentrySDK.setAppStartMeasurement(nil)
         sut = SentryAppStartTrackingIntegration()
+        clearTestState()
     }
 
     override func tearDown() {

diff --git a/...yTests/Integrations/Performance/FramesTracking/SentryFramesTrackingIntegrationTests.swift b/...yTests/Integrations/Performance/FramesTracking/SentryFramesTrackingIntegrationTests.swift
@@ -27,6 +27,7 @@ class SentryFramesTrackingIntegrationTests: XCTestCase {
 
     override func tearDown() {
         PrivateSentrySDKOnly.framesTrackingMeasurementHybridSDKMode = false
+        clearTestState()
         super.tearDown()
     }
 

diff --git a/Tests/SentryTests/Networking/SentryHttpTransportTests.swift b/Tests/SentryTests/Networking/SentryHttpTransportTests.swift
@@ -155,6 +155,7 @@ class SentryHttpTransportTests: XCTestCase {
         super.tearDown()
         fixture.fileManager.deleteAllEnvelopes()
         fixture.requestManager.waitForAllRequests()
+        clearTestState()
     }
 
     func testInitSendsCachedEnvelopes() {

diff --git a/Tests/SentryTests/Protocol/SentryEnvelopeTests.swift b/Tests/SentryTests/Protocol/SentryEnvelopeTests.swift
@@ -56,16 +56,13 @@ class SentryEnvelopeTests: XCTestCase {
         SentryDependencyContainer.sharedInstance().dateProvider = TestCurrentDateProvider()
     }
 
-    override func tearDown() {
-        super.tearDown()
-        do {
-            let fileManager = FileManager.default
-            if fileManager.fileExists(atPath: fixture.path) {
-                try fileManager.removeItem(atPath: fixture.path)
-            }
-        } catch {
-            XCTFail("Couldn't delete files.")
+    override func tearDownWithError() throws {
+        try super.tearDownWithError()
+        let fileManager = FileManager.default
+        if fileManager.fileExists(atPath: fixture.path) {
+            try fileManager.removeItem(atPath: fixture.path)
         }
+        clearTestState()
     }
 
     private let defaultSdkInfo = SentrySdkInfo(name: SentryMeta.sdkName, andVersion: SentryMeta.versionString)

diff --git a/Tests/SentryTests/SentryHubTests.swift b/Tests/SentryTests/SentryHubTests.swift
@@ -78,6 +78,7 @@ class SentryHubTests: XCTestCase {
         fixture.fileManager.deleteAppState()
         fixture.fileManager.deleteTimestampLastInForeground()
         fixture.fileManager.deleteAllEnvelopes()
+        clearTestState()
     }
 
     func testBeforeBreadcrumbWithoutCallbackStoresBreadcrumb() {