Fixed a few more tests and updated more code to the new mocking system

• Added a mechanism to ignore the type comparison when comparing against `any` values (for things like `MockEndpoint.any`) • Fixed an issue where `any` values weren't being compared recursively (so it would fail to match if an argument of an argument was a wildcard) • Updated MockNetwork to use Mockable • Updated MockExtensionHelper to be Mockable
mpretty-cyro · Mar 5, 2026 · Aug 7, 2025 · Aug 7, 2025 · Aug 7, 2025 · Aug 8, 2025
commit 04fb9d471e9c2e3e7360f5370742c4379eebc6c3
diff --git a/SessionMessagingKitTests/Database/Models/MessageDeduplicationSpec.swift b/SessionMessagingKitTests/Database/Models/MessageDeduplicationSpec.swift
diff --git a/SessionMessagingKitTests/Jobs/DisplayPictureDownloadJobSpec.swift b/SessionMessagingKitTests/Jobs/DisplayPictureDownloadJobSpec.swift
@@ -40,22 +40,7 @@ class DisplayPictureDownloadJobSpec: AsyncSpec {
             "673120e153a5cb6b869380744d493068ebc418266d6596d728cfc60b30662a089376" +
             "f2761e3bb6ee837a26b24b5"
         )
-        @TestState(singleton: .network, in: dependencies) var mockNetwork: MockNetwork! = MockNetwork(
-            initialSetup: { network in
-                network
-                    .when {
-                        $0.send(
-                            endpoint: MockEndpoint.any,
-                            destination: .any,
-                            body: .any,
-                            category: .any,
-                            requestTimeout: .any,
-                            overallTimeout: .any
-                        )
-                    }
-                    .thenReturn(MockNetwork.response(data: encryptedData))
-            }
-        )
+        @TestState var mockNetwork: MockNetwork! = .create()
         @TestState(singleton: .fileManager, in: dependencies) var mockFileManager: MockFileManager! = MockFileManager(
             initialSetup: { $0.defaultInitialSetup() }
         )
@@ -104,6 +89,20 @@ class DisplayPictureDownloadJobSpec: AsyncSpec {
             try await mockCrypto
                 .when { $0.generate(.signatureBlind15(message: .any, serverPublicKey: .any, ed25519SecretKey: .any)) }
                 .thenReturn("TestSogsSignature".bytes)
+
+            try await mockNetwork
+                .when {
+                    $0.send(
+                        endpoint: MockEndpoint.any,
+                        destination: .any,
+                        body: .any,
+                        category: .any,
+                        requestTimeout: .any,
+                        overallTimeout: .any
+                    )
+                }
+                .thenReturn(MockNetwork.response(data: encryptedData))
+            dependencies.set(singleton: .network, to: mockNetwork)
         }
 
         // MARK: - a DisplayPictureDownloadJob
@@ -510,17 +509,18 @@ class DisplayPictureDownloadJobSpec: AsyncSpec {
                     using: dependencies
                 )
 
-                expect(mockNetwork)
-                    .to(call(.exactly(times: 1), matchingParameters: .all) { network in
-                        network.send(
+                await mockNetwork
+                    .verify {
+                        $0.send(
                             endpoint: expectedRequest.endpoint,
                             destination: expectedRequest.destination,
                             body: expectedRequest.body,
                             category: .download,
                             requestTimeout: expectedRequest.requestTimeout,
                             overallTimeout: expectedRequest.overallTimeout
                         )
-                    })
+                    }
+                    .wasCalled(exactly: 1)
             }
 
             // MARK: -- generates a SOGS download request correctly
@@ -575,17 +575,18 @@ class DisplayPictureDownloadJobSpec: AsyncSpec {
                     using: dependencies
                 )
 
-                expect(mockNetwork)
-                    .to(call(.exactly(times: 1), matchingParameters: .all) { network in
-                        network.send(
+                await mockNetwork
+                    .verify {
+                        $0.send(
                             endpoint: expectedRequest.endpoint,
                             destination: expectedRequest.destination,
                             body: expectedRequest.body,
                             category: .download,
                             requestTimeout: expectedRequest.requestTimeout,
                             overallTimeout: expectedRequest.overallTimeout
                         )
-                    })
+                    }
+                    .wasCalled(exactly: 1)
             }
 
             // MARK: -- checking if a downloaded display picture is valid
@@ -1092,7 +1093,7 @@ class DisplayPictureDownloadJobSpec: AsyncSpec {
                         )
 
                         // SOGS doesn't encrypt it's images so replace the encrypted mock response
-                        mockNetwork
+                        try await mockNetwork
                             .when {
                                 $0.send(
                                     endpoint: MockEndpoint.any,

diff --git a/SessionMessagingKitTests/Jobs/RetrieveDefaultOpenGroupRoomsJobSpec.swift b/SessionMessagingKitTests/Jobs/RetrieveDefaultOpenGroupRoomsJobSpec.swift
@@ -2,6 +2,7 @@
 
 import Foundation
 import GRDB
+import TestUtilities
 
 import Quick
 import Nimble
@@ -23,47 +24,7 @@ class RetrieveDefaultOpenGroupRoomsJobSpec: AsyncSpec {
             using: dependencies
         )
         @TestState var mockUserDefaults: MockUserDefaults! = .create()
-        @TestState(singleton: .network, in: dependencies) var mockNetwork: MockNetwork! = MockNetwork(
-            initialSetup: { network in
-                network.when { $0.networkStatus }.thenReturn(.singleValue(value: .connected))
-                network
-                    .when {
-                        $0.send(
-                            endpoint: MockEndpoint.any,
-                            destination: .any,
-                            body: .any,
-                            category: .any,
-                            requestTimeout: .any,
-                            overallTimeout: .any
-                        )
-                    }
-                    .thenReturn(
-                        MockNetwork.batchResponseData(
-                            with: [
-                                (
-                                    OpenGroupAPI.Endpoint.capabilities,
-                                    OpenGroupAPI.Capabilities(capabilities: [.blind, .reactions]).batchSubResponse()
-                                ),
-                                (
-                                    OpenGroupAPI.Endpoint.rooms,
-                                    [
-                                        OpenGroupAPI.Room.mock.with(
-                                            token: "testRoom",
-                                            name: "TestRoomName"
-                                        ),
-                                        OpenGroupAPI.Room.mock.with(
-                                            token: "testRoom2",
-                                            name: "TestRoomName2",
-                                            infoUpdates: 12,
-                                            imageId: "12"
-                                        )
-                                    ].batchSubResponse()
-                                )
-                            ]
-                        )
-                    )
-            }
-        )
+        @TestState var mockNetwork: MockNetwork! = .create()
         @TestState(singleton: .jobRunner, in: dependencies) var mockJobRunner: MockJobRunner! = MockJobRunner(
             initialSetup: { jobRunner in
                 jobRunner
@@ -103,6 +64,45 @@ class RetrieveDefaultOpenGroupRoomsJobSpec: AsyncSpec {
             try await mockUserDefaults.defaultInitialSetup()
             try await mockUserDefaults.when { $0.bool(forKey: .any) }.thenReturn(true)
             dependencies.set(defaults: .appGroup, to: mockUserDefaults)
+
+            try await mockNetwork.when { $0.networkStatus }.thenReturn(.singleValue(value: .connected))
+            try await mockNetwork
+                .when {
+                    $0.send(
+                        endpoint: MockEndpoint.any,
+                        destination: .any,
+                        body: .any,
+                        category: .any,
+                        requestTimeout: .any,
+                        overallTimeout: .any
+                    )
+                }
+                .thenReturn(
+                    MockNetwork.batchResponseData(
+                        with: [
+                            (
+                                OpenGroupAPI.Endpoint.capabilities,
+                                OpenGroupAPI.Capabilities(capabilities: [.blind, .reactions]).batchSubResponse()
+                            ),
+                            (
+                                OpenGroupAPI.Endpoint.rooms,
+                                [
+                                    OpenGroupAPI.Room.mock.with(
+                                        token: "testRoom",
+                                        name: "TestRoomName"
+                                    ),
+                                    OpenGroupAPI.Room.mock.with(
+                                        token: "testRoom2",
+                                        name: "TestRoomName2",
+                                        infoUpdates: 12,
+                                        imageId: "12"
+                                    )
+                                ].batchSubResponse()
+                            )
+                        ]
+                    )
+                )
+            dependencies.set(singleton: .network, to: mockNetwork)
         }
 
         // MARK: - a RetrieveDefaultOpenGroupRoomsJob
@@ -188,7 +188,7 @@ class RetrieveDefaultOpenGroupRoomsJobSpec: AsyncSpec {
 
             // MARK: -- creates an inactive entry in the database if one does not exist
             it("creates an inactive entry in the database if one does not exist") {
-                mockNetwork
+                try await mockNetwork
                     .when {
                         $0.send(
                             endpoint: MockEndpoint.any,
@@ -221,7 +221,7 @@ class RetrieveDefaultOpenGroupRoomsJobSpec: AsyncSpec {
 
             // MARK: -- does not create a new entry if one already exists
             it("does not create a new entry if one already exists") {
-                mockNetwork
+                try await mockNetwork
                     .when {
                         $0.send(
                             endpoint: MockEndpoint.any,
@@ -302,22 +302,23 @@ class RetrieveDefaultOpenGroupRoomsJobSpec: AsyncSpec {
                     using: dependencies
                 )
 
-                expect(mockNetwork)
-                    .to(call { network in
-                        network.send(
+                await mockNetwork
+                    .verify {
+                        $0.send(
                             endpoint: OpenGroupAPI.Endpoint.sequence,
                             destination: expectedRequest.destination,
                             body: expectedRequest.body,
                             category: .standard,
                             requestTimeout: expectedRequest.requestTimeout,
                             overallTimeout: expectedRequest.overallTimeout
                         )
-                    })
+                    }
+                    .wasCalled(exactly: 1)
             }
 
             // MARK: -- permanently fails if it gets an error
             it("permanently fails if it gets an error") {
-                mockNetwork
+                try await mockNetwork
                     .when {
                         $0.send(
                             endpoint: MockEndpoint.any,
@@ -344,16 +345,18 @@ class RetrieveDefaultOpenGroupRoomsJobSpec: AsyncSpec {
 
                 expect(error).to(matchError(NetworkError.parsingFailed))
                 expect(permanentFailure).to(beTrue())
-                expect(mockNetwork).to(call(.exactly(times: 1)) { network in
-                    network.send(
-                        endpoint: MockEndpoint.any,
-                        destination: .any,
-                        body: .any,
-                        category: .any,
-                        requestTimeout: .any,
-                        overallTimeout: .any
-                    )
-                })
+                await mockNetwork
+                    .verify {
+                        $0.send(
+                            endpoint: MockEndpoint.any,
+                            destination: .any,
+                            body: .any,
+                            category: .any,
+                            requestTimeout: .any,
+                            overallTimeout: .any
+                        )
+                    }
+                    .wasCalled(exactly: 1)
             }
 
             // MARK: -- stores the updated capabilities
@@ -415,7 +418,7 @@ class RetrieveDefaultOpenGroupRoomsJobSpec: AsyncSpec {
                     )
                     .insert(db)
                 }
-                mockNetwork
+                try await mockNetwork
                     .when {
                         $0.send(
                             endpoint: MockEndpoint.any,
@@ -552,7 +555,7 @@ class RetrieveDefaultOpenGroupRoomsJobSpec: AsyncSpec {
 
             // MARK: -- does not schedule a display picture download if there is no imageId
             it("does not schedule a display picture download if there is no imageId") {
-                mockNetwork
+                try await mockNetwork
                     .when {
                         $0.send(
                             endpoint: MockEndpoint.any,