Add lock to guard access to calls in multithreaded tests

Author: tboogh

Sources/MockingKit/Mock.swift

@@ -24,4 +24,5 @@ open class Mock: Mockable, @unchecked Sendable {
 
     var registeredCalls: [UUID: [AnyCall]] = [:]
     var registeredResults: [UUID: Function] = [:]
+    let registeredCallsLock = NSLock()
 }

Sources/MockingKit/Mockable.swift

@@ -38,41 +38,55 @@ extension Mockable {
         _ call: MockCall<Arguments, Result>,
         for ref: MockReference<Arguments, Result>
     ) {
-        let calls = mock.registeredCalls[ref.id] ?? []
-        mock.registeredCalls[ref.id] = calls + [call]
+        mock.registeredCallsLock.withLock {
+            let calls = mock.registeredCalls[ref.id] ?? []
+            mock.registeredCalls[ref.id] = calls + [call]
+        }
     }
 
     func registerCall<Arguments, Result>(
         _ call: MockCall<Arguments, Result>,
         for ref: AsyncMockReference<Arguments, Result>
     ) {
-        let calls = mock.registeredCalls[ref.id] ?? []
-        mock.registeredCalls[ref.id] = calls + [call]
+        mock.registeredCallsLock.withLock {
+            let calls = mock.registeredCalls[ref.id] ?? []
+            mock.registeredCalls[ref.id] = calls + [call]
+        }
     }
 
     func registeredCalls<Arguments, Result>(
         for ref: MockReference<Arguments, Result>
     ) -> [MockCall<Arguments, Result>] {
-        let calls = mock.registeredCalls[ref.id]
-        return (calls as? [MockCall<Arguments, Result>]) ?? []
+        mock.registeredCallsLock.withLock {
+            let calls = mock.registeredCalls[ref.id]
+            return (calls as? [MockCall<Arguments, Result>]) ?? []
+        }
     }
 
     func registeredCalls<Arguments, Result>(
         for ref: AsyncMockReference<Arguments, Result>
     ) -> [MockCall<Arguments, Result>] {
-        let calls = mock.registeredCalls[ref.id]
-        return (calls as? [MockCall<Arguments, Result>]) ?? []
+        mock.registeredCallsLock.withLock {
+            let calls = mock.registeredCalls[ref.id]
+            return (calls as? [MockCall<Arguments, Result>]) ?? []
+        }
     }
 
     func registeredResult<Arguments, Result>(
         for ref: MockReference<Arguments, Result>
     ) -> ((Arguments) throws -> Result)? {
-        mock.registeredResults[ref.id] as? (Arguments) throws -> Result
+        mock.registeredCallsLock.withLock {
+            let result = mock.registeredResults[ref.id] as? (Arguments) throws -> Result
+            return result
+        }
     }
 
     func registeredResult<Arguments, Result>(
         for ref: AsyncMockReference<Arguments, Result>
     ) -> ((Arguments) async throws -> Result)? {
-        mock.registeredResults[ref.id] as? (Arguments) async throws -> Result
+        mock.registeredCallsLock.withLock {
+            let result = mock.registeredResults[ref.id] as? (Arguments) async throws -> Result
+            return result
+        }
     }
 }