More test suite fixes

Author: ncooke3

FirebaseCore/Internal/Tests/Unit/HeartbeatControllerTests.swift

@@ -426,7 +426,10 @@ class HeartbeatControllerTests: XCTestCase {
 
 // MARK: - Fakes
 
-private class HeartbeatStorageFake: HeartbeatStorageProtocol {
+private final class HeartbeatStorageFake: HeartbeatStorageProtocol, @unchecked Sendable {
+  // The unchecked Sendable conformance is used to prevent warnings for the below var, which
+  // violates the class's Sendable conformance. Ignoring this violation should be okay for
+  // testing purposes.
   private var heartbeatsBundle: HeartbeatsBundle?
 
   func readAndWriteSync(using transform: (HeartbeatsBundle?) -> HeartbeatsBundle?) {

FirebaseCore/Internal/Tests/Unit/HeartbeatStorageTests.swift

@@ -15,6 +15,14 @@
 @testable import FirebaseCoreInternal
 import XCTest
 
+extension HeartbeatsBundle {
+  static let testHeartbeatBundle: Self = {
+    var heartbeatBundle = HeartbeatsBundle(capacity: 1)
+    heartbeatBundle.append(Heartbeat(agent: "dummy_agent", date: Date()))
+    return heartbeatBundle
+  }()
+}
+
 class HeartbeatStorageTests: XCTestCase {
   // MARK: - Instance Management
 
@@ -95,23 +103,20 @@ class HeartbeatStorageTests: XCTestCase {
     let expectation = expectation(description: #function)
     let heartbeatStorage = HeartbeatStorage(id: #function, storage: StorageFake())
 
-    var dummyHeartbeatsBundle = HeartbeatsBundle(capacity: 1)
-    dummyHeartbeatsBundle.append(Heartbeat(agent: "dummy_agent", date: Date()))
-
     // When
     heartbeatStorage.readAndWriteAsync { heartbeatsBundle in
       // Assert that heartbeat storage is empty.
       XCTAssertNil(heartbeatsBundle)
       // Write new value.
-      return dummyHeartbeatsBundle
+      return HeartbeatsBundle.testHeartbeatBundle
     }
 
     heartbeatStorage.readAndWriteAsync { heartbeatsBundle in
       expectation.fulfill()
       // Assert old value is read.
       XCTAssertEqual(
         heartbeatsBundle?.makeHeartbeatsPayload(),
-        dummyHeartbeatsBundle.makeHeartbeatsPayload()
+        HeartbeatsBundle.testHeartbeatBundle.makeHeartbeatsPayload()
       )
       // Write some new value.
       return heartbeatsBundle
@@ -145,9 +150,6 @@ class HeartbeatStorageTests: XCTestCase {
     let storageFake = StorageFake()
     let heartbeatStorage = HeartbeatStorage(id: #function, storage: storageFake)
 
-    var dummyHeartbeatsBundle = HeartbeatsBundle(capacity: 1)
-    dummyHeartbeatsBundle.append(Heartbeat(agent: "dummy_agent", date: Date()))
-
     // When
     storageFake.onWrite = { _ in
       expectation.fulfill() // Fulfilled 2 times.
@@ -156,18 +158,18 @@ class HeartbeatStorageTests: XCTestCase {
 
     heartbeatStorage.readAndWriteAsync { heartbeatsBundle in
       expectation.fulfill()
-      return dummyHeartbeatsBundle
+      return HeartbeatsBundle.testHeartbeatBundle
     }
 
     // Then
     heartbeatStorage.readAndWriteAsync { heartbeatsBundle in
       expectation.fulfill()
       XCTAssertNotEqual(
         heartbeatsBundle?.makeHeartbeatsPayload(),
-        dummyHeartbeatsBundle.makeHeartbeatsPayload(),
+        HeartbeatsBundle.testHeartbeatBundle.makeHeartbeatsPayload(),
         "They should not be equal because the previous save failed."
       )
-      return dummyHeartbeatsBundle
+      return HeartbeatsBundle.testHeartbeatBundle
     }
 
     wait(for: [expectation], timeout: 0.5)
@@ -212,16 +214,13 @@ class HeartbeatStorageTests: XCTestCase {
     // Given
     let heartbeatStorage = HeartbeatStorage(id: #function, storage: StorageFake())
 
-    var dummyHeartbeatsBundle = HeartbeatsBundle(capacity: 1)
-    dummyHeartbeatsBundle.append(Heartbeat(agent: "dummy_agent", date: Date()))
-
     // When
     let expectation1 = expectation(description: #function + "_1")
     heartbeatStorage.getAndSetAsync { heartbeatsBundle in
       // Assert that heartbeat storage is empty.
       XCTAssertNil(heartbeatsBundle)
       // Write new value.
-      return dummyHeartbeatsBundle
+      return HeartbeatsBundle.testHeartbeatBundle
     } completion: { result in
       switch result {
       case .success: break
@@ -237,7 +236,7 @@ class HeartbeatStorageTests: XCTestCase {
         // Assert old value is read.
         XCTAssertEqual(
           heartbeatsBundle?.makeHeartbeatsPayload(),
-          dummyHeartbeatsBundle.makeHeartbeatsPayload()
+          HeartbeatsBundle.testHeartbeatBundle.makeHeartbeatsPayload()
         )
         // Write some new value.
         expectation2.fulfill()
@@ -368,7 +367,7 @@ class HeartbeatStorageTests: XCTestCase {
     let expectations: [XCTestExpectation] = try (0 ... 1000).map { i in
       let expectation = expectation(description: "\(#function)_\(i)")
 
-      let transform: (HeartbeatsBundle?) -> HeartbeatsBundle? = { heartbeatsBundle in
+      let transform: @Sendable (HeartbeatsBundle?) -> HeartbeatsBundle? = { heartbeatsBundle in
         expectation.fulfill()
         return heartbeatsBundle
       }
@@ -431,7 +430,10 @@ class HeartbeatStorageTests: XCTestCase {
   }
 }
 
-private class StorageFake: Storage {
+private final class StorageFake: Storage, @unchecked Sendable {
+  // The unchecked Sendable conformance is used to prevent warnings for the below var, which
+  // violates the class's Sendable conformance. Ignoring this violation should be okay for
+  // testing purposes.
   var fakeFile: Data?
   var onRead: (() throws -> Data)?
   var onWrite: ((Data?) throws -> Void)?