diff --git a/ElementX/Sources/Mocks/TimelineControllerMock.swift b/ElementX/Sources/Mocks/TimelineControllerMock.swift index c74b1ffd3..dc1b452fe 100644 --- a/ElementX/Sources/Mocks/TimelineControllerMock.swift +++ b/ElementX/Sources/Mocks/TimelineControllerMock.swift @@ -11,6 +11,7 @@ import Combine import Foundation import MatrixRustSDK +import MatrixRustSDKMocks struct TimelineControllerMockConfiguration { var roomProxy: JoinedRoomProxyProtocol? @@ -204,7 +205,7 @@ extension TimelineControllerMock { return .success(()) } - messageEventContentForReturnValue = .init(noHandle: .init()) + messageEventContentForReturnValue = RoomMessageEventContentWithoutRelationSDKMock() debugInfoForReturnValue = .init(model: "Mock debug description", originalJSON: nil, latestEditJSON: nil) eventTimestampForClosure = { [timelineItemsTimestamps] itemID in diff --git a/ElementX/Sources/Mocks/TimelineProxyMock.swift b/ElementX/Sources/Mocks/TimelineProxyMock.swift index 8feeb5221..f8a6c859c 100644 --- a/ElementX/Sources/Mocks/TimelineProxyMock.swift +++ b/ElementX/Sources/Mocks/TimelineProxyMock.swift @@ -9,6 +9,7 @@ import Combine import Foundation import MatrixRustSDK +import MatrixRustSDKMocks extension TimelineProxyMock { struct Configuration { @@ -24,7 +25,7 @@ extension TimelineProxyMock { sendMessageEventContentReturnValue = .success(()) sendMessageHtmlInReplyToEventIDIntentionalMentionsReturnValue = .success(()) editNewContentReturnValue = .success(()) - buildMessageContentForHtmlIntentionalMentionsReturnValue = RoomMessageEventContentWithoutRelation(noHandle: .init()) + buildMessageContentForHtmlIntentionalMentionsReturnValue = RoomMessageEventContentWithoutRelationSDKMock() paginateBackwardsRequestSizeReturnValue = .success(()) paginateForwardsRequestSizeReturnValue = .success(()) sendReadReceiptForTypeReturnValue = .success(()) diff --git a/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift b/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift index 3d28a9145..5311fbb5e 100644 --- a/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift +++ b/ElementX/Sources/Screens/MessageForwardingScreen/View/MessageForwardingScreen.swift @@ -7,6 +7,7 @@ // import Compound +import MatrixRustSDKMocks import SwiftUI struct MessageForwardingScreen: View { @@ -97,7 +98,7 @@ struct MessageForwardingScreen_Previews: PreviewProvider, TestablePreview { let summaryProvider = RoomSummaryProviderMock(.init(state: .loaded(.mockRooms))) let viewModel = MessageForwardingScreenViewModel(forwardingItem: .init(id: .randomEvent, roomID: "", - content: .init(noHandle: .init())), + content: RoomMessageEventContentWithoutRelationSDKMock()), userSession: UserSessionMock(.init()), roomSummaryProvider: summaryProvider, userIndicatorController: UserIndicatorControllerMock()) diff --git a/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift b/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift index 82fa09d1f..02ed60743 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift @@ -8,6 +8,7 @@ import Foundation import MatrixRustSDK +import MatrixRustSDKMocks /// A light wrapper around timeline items returned from Rust. enum TimelineItemProxy { @@ -204,7 +205,7 @@ struct SendHandleProxy: Hashable { static var mock: SendHandleProxy { .init(itemID: .event(uniqueID: .init(UUID().uuidString), eventOrTransactionID: .eventID(UUID().uuidString)), - underlyingHandle: .init(noHandle: .init())) + underlyingHandle: SendHandleSDKMock()) } } diff --git a/ElementX/Sources/UITests/UITestsAppCoordinator.swift b/ElementX/Sources/UITests/UITestsAppCoordinator.swift index 019825e58..c44dcdadd 100644 --- a/ElementX/Sources/UITests/UITestsAppCoordinator.swift +++ b/ElementX/Sources/UITests/UITestsAppCoordinator.swift @@ -8,6 +8,7 @@ import Combine import MatrixRustSDK +import MatrixRustSDKMocks import SwiftUI import UIKit @@ -876,7 +877,7 @@ class MockScreen: Identifiable { timelineProxy.buildMessageContentForHtmlIntentionalMentionsClosure = { text, _, _ in pendingEditText = text - return RoomMessageEventContentWithoutRelation(noHandle: .init()) + return RoomMessageEventContentWithoutRelationSDKMock() } timelineProxy.editNewContentClosure = { [weak itemProvider] _, _ in diff --git a/UnitTests/Sources/AuthenticationServiceTests.swift b/UnitTests/Sources/AuthenticationServiceTests.swift index f833dcc10..0eb4b110b 100644 --- a/UnitTests/Sources/AuthenticationServiceTests.swift +++ b/UnitTests/Sources/AuthenticationServiceTests.swift @@ -147,7 +147,7 @@ struct AuthenticationServiceTests { let classicAppManager = ClassicAppManagerMock(.init(accounts: classicAppAccounts, availableSecrets: availableSecrets, - secretsBundle: .init(noHandle: .init()))) + secretsBundle: SecretsBundleWithUserIdSDKMock())) service = AuthenticationService(userSessionStore: userSessionStore, encryptionKeyProvider: encryptionKeyProvider, diff --git a/UnitTests/Sources/HomeScreenRoomTests.swift b/UnitTests/Sources/HomeScreenRoomTests.swift index 65973b957..5d6117864 100644 --- a/UnitTests/Sources/HomeScreenRoomTests.swift +++ b/UnitTests/Sources/HomeScreenRoomTests.swift @@ -8,6 +8,7 @@ import Combine @testable import ElementX +import MatrixRustSDKMocks import Testing @MainActor @@ -21,7 +22,7 @@ struct HomeScreenRoomTests { notificationMode: RoomNotificationModeProxy, hasOngoingCall: Bool, activeCallIntent: CallIntent? = nil) { - roomSummary = RoomSummary(room: .init(noHandle: .init()), + roomSummary = RoomSummary(room: RoomSDKMock(), id: "Test room", joinRequestType: nil, name: "Test room", diff --git a/UnitTests/Sources/LoggingTests.swift b/UnitTests/Sources/LoggingTests.swift index 2beb33a99..9355e6cb1 100644 --- a/UnitTests/Sources/LoggingTests.swift +++ b/UnitTests/Sources/LoggingTests.swift @@ -9,6 +9,7 @@ @testable import ElementX import Foundation @testable import MatrixRustSDK +import MatrixRustSDKMocks import Testing final class LoggingTests { @@ -72,7 +73,7 @@ final class LoggingTests { let roomName = "Private Conversation" let lastMessage = "Secret information" let heroName = "Pseudonym" - let roomSummary = RoomSummary(room: .init(noHandle: .init()), + let roomSummary = RoomSummary(room: RoomSDKMock(), id: "myroomid", joinRequestType: nil, name: roomName, @@ -223,19 +224,19 @@ final class LoggingTests { let rustImageMessage = ImageMessageContent(filename: "ImageString", caption: "ImageString", formattedCaption: nil, - source: MediaSource(noHandle: .init()), + source: MediaSourceSDKMock(), info: nil) let rustVideoMessage = VideoMessageContent(filename: "VideoString", caption: "VideoString", formattedCaption: nil, - source: MediaSource(noHandle: .init()), + source: MediaSourceSDKMock(), info: nil) let rustFileMessage = FileMessageContent(filename: "FileString", caption: "FileString", formattedCaption: nil, - source: MediaSource(noHandle: .init()), + source: MediaSourceSDKMock(), info: nil) // When logging that value diff --git a/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift b/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift index d568b6654..cc31a6c69 100644 --- a/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift +++ b/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift @@ -8,13 +8,14 @@ import Combine @testable import ElementX +import MatrixRustSDKMocks import Testing @MainActor struct MessageForwardingScreenViewModelTests { let forwardingItem = MessageForwardingItem(id: .event(uniqueID: .init("t1"), eventOrTransactionID: .eventID("t1")), roomID: "1", - content: .init(noHandle: .init())) + content: RoomMessageEventContentWithoutRelationSDKMock()) var viewModel: MessageForwardingScreenViewModelProtocol! var context: MessageForwardingScreenViewModelType.Context! diff --git a/UnitTests/Sources/RoomSummaryProviderTests.swift b/UnitTests/Sources/RoomSummaryProviderTests.swift index 8248da883..396de4a69 100644 --- a/UnitTests/Sources/RoomSummaryProviderTests.swift +++ b/UnitTests/Sources/RoomSummaryProviderTests.swift @@ -112,7 +112,7 @@ final class RoomSummaryProviderTests { dynamicAdaptersResult.controllerReturnValue = dynamicEntriesController roomList = RoomListSDKMock() roomList.entriesWithDynamicAdaptersPageSizeListenerReturnValue = dynamicAdaptersResult - roomList.loadingStateListenerReturnValue = .some(.init(state: .notLoaded, stateStream: .init(noHandle: .init()))) + roomList.loadingStateListenerReturnValue = .some(.init(state: .notLoaded, stateStream: TaskHandleSDKMock())) roomSummaryProvider.setRoomList(roomList) } } diff --git a/UnitTests/Sources/RoomSummaryTests.swift b/UnitTests/Sources/RoomSummaryTests.swift index cc5108b5c..562d2b49d 100644 --- a/UnitTests/Sources/RoomSummaryTests.swift +++ b/UnitTests/Sources/RoomSummaryTests.swift @@ -8,6 +8,7 @@ @testable import ElementX import Foundation +import MatrixRustSDKMocks import Testing struct RoomSummaryTests { @@ -95,7 +96,7 @@ struct RoomSummaryTests { // MARK: - Helpers func makeSummary(isDirect: Bool, isSpace: Bool, hasRoomAvatar: Bool, isTombstoned: Bool) -> RoomSummary { - RoomSummary(room: .init(noHandle: .init()), + RoomSummary(room: RoomSDKMock(), id: roomDetails.id, joinRequestType: nil, name: roomDetails.name,