Fix test failures with Swift version <5.8 (#8)

juyan · Jan 16, 2024 · 9f2e14a · 9f2e14a
2 parents b15e162 + 8dd2c31
commit 9f2e14a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/Tests/SwiftFileStoreTests/FileObjectStoreTests.swift b/Tests/SwiftFileStoreTests/FileObjectStoreTests.swift
@@ -75,9 +75,9 @@ final class FileObjectStoreTests: XCTestCase {
             XCTAssertEqual(values, [nil, object, object2])
             expectation2.fulfill()
         }
-        await fulfillment(of: [expectation], timeout: 1)
+        await fulfillmentCompat(expectations: [expectation], timeout: 1)
         try await store.write(key: "test", namespace: "test", object: object)
         try await store.write(key: "test", namespace: "test", object: object2)
-        await fulfillment(of: [expectation2], timeout: 1)
+        await fulfillmentCompat(expectations: [expectation2], timeout: 1)
     }
 }
diff --git a/Tests/SwiftFileStoreTests/MemoryObjectStoreTests.swift b/Tests/SwiftFileStoreTests/MemoryObjectStoreTests.swift
@@ -65,9 +65,9 @@ final class MemoryObjectStoreTests: XCTestCase {
             XCTAssertEqual(values, [nil, object, object2])
             expectation2.fulfill()
         }
-        await fulfillment(of: [expectation], timeout: 1)
+        await fulfillmentCompat(expectations: [expectation], timeout: 1)
         try await store.write(key: "test", namespace: "test", object: object)
         try await store.write(key: "test", namespace: "test", object: object2)
-        await fulfillment(of: [expectation2], timeout: 1)
+        await fulfillmentCompat(expectations: [expectation2], timeout: 1)
     }
 }
diff --git a/Tests/SwiftFileStoreTests/XCTestCase+.swift b/Tests/SwiftFileStoreTests/XCTestCase+.swift
@@ -0,0 +1,21 @@
+//
+//  File.swift
+//  
+//
+//  Created by Jun Yan on 1/15/24.
+//
+
+import Foundation
+import XCTest
+
+extension XCTestCase {
+
+
+    func fulfillmentCompat(expectations: [XCTestExpectation], timeout: TimeInterval) async {
+    #if swift(>=5.8)
+        await fulfillment(of: expectations, timeout: timeout)
+    #else
+        wait(for: expectations, timeout: timeout)
+    #endif
+    }
+}