test: Delete all folders in http flush tests

Delete all folders after running all http flush tests. Also
fix a few minor typos.

Author: philipphofmann

Tests/SentryTests/Networking/SentryHttpTransportFlushIntegrationTests.swift

@@ -7,8 +7,8 @@ final class SentryHttpTransportFlushIntegrationTests: XCTestCase {
     private let flushTimeout: TimeInterval = 5.0
 
     func testFlush_WhenNoEnvelopes_BlocksAndFinishes() throws {
-
-        let (sut, _, _, _) = try getSut()
+        let (sut, _, fileManager, _) = try getSut()
+        defer { fileManager.deleteAllFolders() }
 
         var blockingDurationSum: TimeInterval = 0.0
         let flushInvocations = 100
@@ -27,13 +27,14 @@ final class SentryHttpTransportFlushIntegrationTests: XCTestCase {
 
     @available(*, deprecated, message: "This is only marked as deprecated because enableAppLaunchProfiling is marked as deprecated. Once that is removed this can be removed.")
     func testFlush_WhenNoInternet_BlocksAndFinishes() throws {
-        let (sut, requestManager, _, dispatchQueueWrapper) = try getSut()
+        let (sut, requestManager, fileManager, dispatchQueueWrapper) = try getSut()
+        defer { fileManager.deleteAllFolders() }
 
         requestManager.returnResponse(response: nil)
 
         sut.send(envelope: SentryEnvelope(event: Event()))
         sut.send(envelope: SentryEnvelope(event: Event()))
-        // Wait until the dispath queue drains to confirm the envelope is stored
+        // Wait until the dispatch queue drains to confirm the envelope is stored
         waitForEnvelopeToBeStored(dispatchQueueWrapper)
 
         var blockingDurationSum: TimeInterval = 0.0
@@ -54,12 +55,11 @@ final class SentryHttpTransportFlushIntegrationTests: XCTestCase {
     @available(*, deprecated, message: "This is only marked as deprecated because enableAppLaunchProfiling is marked as deprecated. Once that is removed this can be removed.")
     func testFlush_CallingFlushDirectlyAfterCapture_Flushes() throws {
         let (sut, _, fileManager, dispatchQueueWrapper) = try getSut()
-
-        defer { fileManager.deleteAllEnvelopes() }
+        defer { fileManager.deleteAllFolders() }
 
         for _ in 0..<10 {
             sut.send(envelope: SentryEnvelope(event: Event()))
-            // Wait until the dispath queue drains to confirm the envelope is stored
+            // Wait until the dispatch queue drains to confirm the envelope is stored
             waitForEnvelopeToBeStored(dispatchQueueWrapper)
 
             XCTAssertEqual(sut.flush(self.flushTimeout), .success, "Flush should not time out.")
@@ -70,14 +70,15 @@ final class SentryHttpTransportFlushIntegrationTests: XCTestCase {
 
     @available(*, deprecated, message: "This is only marked as deprecated because enableAppLaunchProfiling is marked as deprecated. Once that is removed this can be removed.")
     func testFlushTimesOut_RequestManagerNeverFinishes_FlushingWorksNextTime() throws {
-        let (sut, requestManager, _, dispatchQueueWrapper) = try getSut()
+        let (sut, requestManager, fileManager, dispatchQueueWrapper) = try getSut()
+        defer { fileManager.deleteAllFolders() }
 
         requestManager.waitForResponseDispatchGroup = true
         requestManager.responseDispatchGroup.enter()
 
         requestManager.returnResponse(response: nil)
         sut.send(envelope: SentryEnvelope(event: Event()))
-        // Wait until the dispath queue drains to confirm the envelope is stored
+        // Wait until the dispatch queue drains to confirm the envelope is stored
         waitForEnvelopeToBeStored(dispatchQueueWrapper)
         requestManager.returnResponse(response: HTTPURLResponse())
 
@@ -90,7 +91,8 @@ final class SentryHttpTransportFlushIntegrationTests: XCTestCase {
 
     @available(*, deprecated, message: "This is only marked as deprecated because enableAppLaunchProfiling is marked as deprecated. Once that is removed this can be removed.")
     func testFlush_CalledMultipleTimes_ImmediatelyReturnsFalse() throws {
-        let (sut, requestManager, _, dispatchQueueWrapper) = try getSut()
+        let (sut, requestManager, fileManager, dispatchQueueWrapper) = try getSut()
+        defer { fileManager.deleteAllFolders() }
 
         // This must be long enough that all the threads we start below get to run
         // while the first call to flush is still blocking
@@ -195,7 +197,7 @@ final class SentryHttpTransportFlushIntegrationTests: XCTestCase {
     }
 
     private func waitForEnvelopeToBeStored(_ dispatchQueueWrapper: SentryDispatchQueueWrapper) {
-        // Wait until the dispath queue drains to confirm the envelope is stored
+        // Wait until the dispatch queue drains to confirm the envelope is stored
         let expectation = XCTestExpectation(description: "Envelope sent")
         dispatchQueueWrapper.dispatchAsync {
             expectation.fulfill()