more fixes

Author: ncooke3

FirebaseCore/Internal/Tests/Integration/HeartbeatLoggingIntegrationTests.swift

@@ -144,7 +144,7 @@ class HeartbeatLoggingIntegrationTests: XCTestCase {
     assertHeartbeatControllerFlushesEmptyPayload(heartbeatController1)
   }
 
-  func testLogAndFlushConcurrencyStressTest() throws {
+  @MainActor func testLogAndFlushConcurrencyStressTest() throws {
     // Given
     let date = Date(timeIntervalSince1970: 1_635_739_200) // 2021-11-01 @ 00:00:00 (EST)
     let heartbeatController = HeartbeatController(id: #function, dateProvider: { date })
@@ -154,39 +154,34 @@ class HeartbeatLoggingIntegrationTests: XCTestCase {
       heartbeatController.log("dummy_agent")
     }
 
-    var payloads: [HeartbeatsPayload] = []
+    let expectation = self.expectation(description: #function)
 
     DispatchQueue.concurrentPerform(iterations: 100) { _ in
       let payload = heartbeatController.flush()
-      payloads.append(payload)
-    }
-
-    // Then
-    let nonEmptyPayloads = payloads.filter { payload in
-      // Filter out non-empty payloads.
-      !payload.userAgentPayloads.isEmpty
-    }
-
-    XCTAssertEqual(nonEmptyPayloads.count, 1)
-
-    let payload = try XCTUnwrap(nonEmptyPayloads.first)
-    try HeartbeatLoggingTestUtils.assertEqualPayloadStrings(
-      payload.headerValue(),
-      """
-      {
-        "version": 2,
-        "heartbeats": [
+      if !payload.userAgentPayloads.isEmpty {
+        try! HeartbeatLoggingTestUtils.assertEqualPayloadStrings(
+          payload.headerValue(),
+          """
           {
-            "agent": "dummy_agent",
-            "dates": ["2021-11-01"]
+            "version": 2,
+            "heartbeats": [
+              {
+                "agent": "dummy_agent",
+                "dates": ["2021-11-01"]
+              }
+            ]
           }
-        ]
+          """
+        )
+        expectation.fulfill()
       }
-      """
-    )
+    }
+
+    // Then
+    wait(for: [expectation])
   }
 
-  func testLogAndFlushHeartbeatFromTodayConcurrencyStressTest() throws {
+  @MainActor func testLogAndFlushHeartbeatFromTodayConcurrencyStressTest() throws {
     // Given
     let date = Date(timeIntervalSince1970: 1_635_739_200) // 2021-11-01 @ 00:00:00 (EST)
     let heartbeatController = HeartbeatController(id: #function, dateProvider: { date })
@@ -196,36 +191,31 @@ class HeartbeatLoggingIntegrationTests: XCTestCase {
       heartbeatController.log("dummy_agent")
     }
 
-    var payloads: [HeartbeatsPayload] = []
+    let expectation = self.expectation(description: #function)
 
     DispatchQueue.concurrentPerform(iterations: 100) { _ in
       let payload = heartbeatController.flushHeartbeatFromToday()
-      payloads.append(payload)
-    }
-
-    // Then
-    let nonEmptyPayloads = payloads.filter { payload in
-      // Filter out non-empty payloads.
-      !payload.userAgentPayloads.isEmpty
-    }
-
-    XCTAssertEqual(nonEmptyPayloads.count, 1)
-
-    let payload = try XCTUnwrap(nonEmptyPayloads.first)
-    try HeartbeatLoggingTestUtils.assertEqualPayloadStrings(
-      payload.headerValue(),
-      """
-      {
-        "version": 2,
-        "heartbeats": [
+      if !payload.userAgentPayloads.isEmpty {
+        try! HeartbeatLoggingTestUtils.assertEqualPayloadStrings(
+          payload.headerValue(),
+          """
           {
-            "agent": "dummy_agent",
-            "dates": ["2021-11-01"],
+            "version": 2,
+            "heartbeats": [
+              {
+                "agent": "dummy_agent",
+                "dates": ["2021-11-01"],
+              }
+            ]
           }
-        ]
+          """
+        )
+        expectation.fulfill()
       }
-      """
-    )
+    }
+
+    // Then
+    wait(for: [expectation])
 
     assertHeartbeatControllerFlushesEmptyPayload(heartbeatController)
   }

FirebaseCore/Internal/Tests/Unit/HeartbeatStorageTests.swift

@@ -15,6 +15,33 @@
 @testable import FirebaseCoreInternal
 import XCTest
 
+public typealias SessionsSubscriberName = Int
+
+public class SessionsDependencies {
+  #if compiler(>=6)
+    private nonisolated(unsafe) static var _dependencies: Set<SessionsSubscriberName> = .init()
+    private(set) static var dependencies: Set<SessionsSubscriberName> {
+      get {
+        lock.withLock {
+          _dependencies
+        }
+      }
+      set {
+        lock.withLock {
+          _dependencies = newValue
+        }
+      }
+    }
+  #else
+    private static var _dependencies: Set<SessionsSubscriberName> = .init()
+  #endif
+  private static let lock = NSLock()
+
+  public static func addDependency(name: SessionsSubscriberName) {
+    SessionsDependencies.dependencies.insert(name)
+  }
+}
+
 extension HeartbeatsBundle {
   static func testHeartbeatBundle() -> HeartbeatsBundle {
     var heartbeatBundle = HeartbeatsBundle(capacity: 1)
@@ -27,6 +54,23 @@ extension HeartbeatsBundle {
 class HeartbeatStorageTests: XCTestCase {
   // MARK: - Instance Management
 
+//  @MainActor func testStressTest() {
+//    var expectations: [XCTestExpectation] = []
+//    let lock = NSLock()
+//    DispatchQueue.concurrentPerform(iterations: 1000) { i in
+//      lock.lock()
+//      let exp = self.expectation(description: "\(i)")
+//      expectations.append(exp)
+//      defer { exp.fulfill() }
+//      lock.unlock()
+//      SessionsDependencies.addDependency(name: i)
+//      exp.fulfill()
+//    }
+//    DispatchQueue.perform
+//    wait(for: expectations)
+//    XCTAssertEqual(SessionsDependencies.dependencies.count, 1000)
+//  }
+
   func testGettingInstance_WithSameID_ReturnsSameInstance() {
     // Given
     let heartbeatStorage1 = HeartbeatStorage.getInstance(id: "sparky")