From 3df3114beef7c3fc977efc6af65b406eff4c0286 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Tue, 19 Jul 2022 09:22:15 +1000 Subject: [PATCH] Fixed the broken unit tests --- .../Open Groups/OpenGroupAPISpec.swift | 2 +- .../Open Groups/OpenGroupManagerSpec.swift | 34 +++++++++---------- .../Open Groups/Types/SOGSEndpointSpec.swift | 2 +- .../_TestUtilities/TestOnionRequestAPI.swift | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift b/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift index 50a99e225..a67c9c3ee 100644 --- a/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift +++ b/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift @@ -2328,7 +2328,7 @@ class OpenGroupAPISpec: QuickSpec { OpenGroupAPI .downloadFile( db, - fileId: 1, + fileId: "1", from: "testRoom", on: "testserver", using: dependencies diff --git a/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift b/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift index bfb823411..e14a1099f 100644 --- a/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift +++ b/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift @@ -1574,7 +1574,7 @@ class OpenGroupManagerSpec: QuickSpec { created: 0, activeUsers: 0, activeUsersCutoff: 0, - imageId: 10, + imageId: "10", pinnedMessages: nil, admin: false, globalAdmin: false, @@ -1732,7 +1732,7 @@ class OpenGroupManagerSpec: QuickSpec { created: 0, activeUsers: 0, activeUsersCutoff: 0, - imageId: 10, + imageId: "10", pinnedMessages: nil, admin: false, globalAdmin: false, @@ -1843,7 +1843,7 @@ class OpenGroupManagerSpec: QuickSpec { created: 0, activeUsers: 0, activeUsersCutoff: 0, - imageId: 10, + imageId: "10", pinnedMessages: nil, admin: false, globalAdmin: false, @@ -1912,7 +1912,7 @@ class OpenGroupManagerSpec: QuickSpec { created: 0, activeUsers: 0, activeUsersCutoff: 0, - imageId: 10, + imageId: "10", pinnedMessages: nil, admin: false, globalAdmin: false, @@ -2988,7 +2988,7 @@ class OpenGroupManagerSpec: QuickSpec { created: 0, activeUsers: 0, activeUsersCutoff: 0, - imageId: 12, + imageId: "12", pinnedMessages: nil, admin: false, globalAdmin: false, @@ -3104,7 +3104,7 @@ class OpenGroupManagerSpec: QuickSpec { created: 0, activeUsers: 0, activeUsersCutoff: 0, - imageId: 12, + imageId: "12", pinnedMessages: nil, admin: false, globalAdmin: false, @@ -3188,7 +3188,7 @@ class OpenGroupManagerSpec: QuickSpec { created: 0, activeUsers: 0, activeUsersCutoff: 0, - imageId: 12, + imageId: "12", pinnedMessages: nil, admin: false, globalAdmin: false, @@ -3279,7 +3279,7 @@ class OpenGroupManagerSpec: QuickSpec { OpenGroupManager .roomImage( db, - fileId: 1, + fileId: "1", for: "testRoom", on: "testServer", using: dependencies @@ -3293,7 +3293,7 @@ class OpenGroupManagerSpec: QuickSpec { OpenGroupManager .roomImage( db, - fileId: 1, + fileId: "1", for: "testRoom", on: "testServer", using: dependencies @@ -3321,7 +3321,7 @@ class OpenGroupManagerSpec: QuickSpec { OpenGroupManager .roomImage( db, - fileId: 1, + fileId: "1", for: "testRoom", on: "testServer", using: dependencies @@ -3348,7 +3348,7 @@ class OpenGroupManagerSpec: QuickSpec { return Promise<(OnionRequestResponseInfoType, Data?)>.pending().promise } - static func sendOnionRequest(to snode: Snode, invoking method: SnodeAPIEndpoint, with parameters: JSON, using version: OnionRequestAPIVersion, associatedWith publicKey: String?) -> Promise { + static func sendOnionRequest(to snode: Snode, invoking method: SnodeAPIEndpoint, with parameters: JSON, associatedWith publicKey: String?) -> Promise { return Promise.value(Data()) } } @@ -3357,7 +3357,7 @@ class OpenGroupManagerSpec: QuickSpec { let promise = mockStorage.read { db in OpenGroupManager.roomImage( db, - fileId: 1, + fileId: "1", for: "testRoom", on: "testServer", using: dependencies @@ -3382,7 +3382,7 @@ class OpenGroupManagerSpec: QuickSpec { OpenGroupManager .roomImage( db, - fileId: 1, + fileId: "1", for: "testRoom", on: OpenGroupAPI.defaultServer, using: dependencies @@ -3400,7 +3400,7 @@ class OpenGroupManagerSpec: QuickSpec { OpenGroupManager .roomImage( db, - fileId: 1, + fileId: "1", for: "testRoom", on: OpenGroupAPI.defaultServer, using: dependencies @@ -3428,7 +3428,7 @@ class OpenGroupManagerSpec: QuickSpec { OpenGroupManager .roomImage( db, - fileId: 1, + fileId: "1", for: "testRoom", on: OpenGroupAPI.defaultServer, using: dependencies @@ -3471,7 +3471,7 @@ class OpenGroupManagerSpec: QuickSpec { OpenGroupManager .roomImage( db, - fileId: 1, + fileId: "1", for: "testRoom", on: OpenGroupAPI.defaultServer, using: dependencies @@ -3500,7 +3500,7 @@ class OpenGroupManagerSpec: QuickSpec { OpenGroupManager .roomImage( db, - fileId: 1, + fileId: "1", for: "testRoom", on: OpenGroupAPI.defaultServer, using: dependencies diff --git a/SessionMessagingKitTests/Open Groups/Types/SOGSEndpointSpec.swift b/SessionMessagingKitTests/Open Groups/Types/SOGSEndpointSpec.swift index 7147b95fa..1dfb972d9 100644 --- a/SessionMessagingKitTests/Open Groups/Types/SOGSEndpointSpec.swift +++ b/SessionMessagingKitTests/Open Groups/Types/SOGSEndpointSpec.swift @@ -46,7 +46,7 @@ class SOGSEndpointSpec: QuickSpec { // Files expect(OpenGroupAPI.Endpoint.roomFile("test").path).to(equal("room/test/file")) - expect(OpenGroupAPI.Endpoint.roomFileIndividual("test", 123).path).to(equal("room/test/file/123")) + expect(OpenGroupAPI.Endpoint.roomFileIndividual("test", "123").path).to(equal("room/test/file/123")) // Inbox/Outbox (Message Requests) diff --git a/SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift b/SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift index 33039ef03..67b7dde86 100644 --- a/SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift +++ b/SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift @@ -54,7 +54,7 @@ class TestOnionRequestAPI: OnionRequestAPIType { return Promise.value((responseInfo, mockResponse)) } - static func sendOnionRequest(to snode: Snode, invoking method: SnodeAPIEndpoint, with parameters: JSON, using version: OnionRequestAPIVersion, associatedWith publicKey: String?) -> Promise { + static func sendOnionRequest(to snode: Snode, invoking method: SnodeAPIEndpoint, with parameters: JSON, associatedWith publicKey: String?) -> Promise { return Promise.value(mockResponse!) } }