ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move more MockTimelineController configuration to the constructor

Browse Source
This commit is contained in:
Stefan Ceriu
2026-05-29 12:35:50 +03:00
parent 4830424427
commit 423bd8073f
11 changed files with 73 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnitTests/Sources/PillContextTests.swift
+9 -18
View File
@@ -81,8 +81,7 @@ struct PillContextTests {
let id = "test_room"
let displayName = "Test"
let proxyMock = JoinedRoomProxyMock(.init(id: id, name: displayName, avatarURL: avatarURL))
let mockController = MockTimelineController()
mockController.roomProxy = proxyMock
let mockController = MockTimelineController(roomProxy: proxyMock)
let mock = TimelineViewModel(roomProxy: proxyMock,
timelineController: mockController,
userSession: UserSessionMock(.init()),
@@ -106,10 +105,9 @@ struct PillContextTests {
let userIndicatorController = UserIndicatorControllerMock()
let proxyMock = JoinedRoomProxyMock(.init())
let mockController = MockTimelineController()
let mockController = MockTimelineController(roomProxy: proxyMock)
let clientMock = ClientProxyMock(.init())
clientMock.roomSummaryForIdentifierReturnValue = .mock(id: "1", name: "Foundation 🔭🪐🌌")
mockController.roomProxy = proxyMock
let mock = TimelineViewModel(roomProxy: proxyMock,
timelineController: mockController,
userSession: UserSessionMock(.init(clientProxy: clientMock)),
@@ -134,8 +132,7 @@ struct PillContextTests {
let userIndicatorController = UserIndicatorControllerMock()
let proxyMock = JoinedRoomProxyMock(.init())
let mockController = MockTimelineController()
mockController.roomProxy = proxyMock
let mockController = MockTimelineController(roomProxy: proxyMock)
let mock = TimelineViewModel(roomProxy: proxyMock,
timelineController: mockController,
userSession: UserSessionMock(.init()),
@@ -160,8 +157,7 @@ struct PillContextTests {
let userIndicatorController = UserIndicatorControllerMock()
let proxyMock = JoinedRoomProxyMock(.init())
let mockController = MockTimelineController()
mockController.roomProxy = proxyMock
let mockController = MockTimelineController(roomProxy: proxyMock)
let clientMock = ClientProxyMock(.init())
clientMock.roomSummaryForAliasReturnValue = .mock(id: "2",
name: "Foundation and Empire",
@@ -190,8 +186,7 @@ struct PillContextTests {
let userIndicatorController = UserIndicatorControllerMock()
let proxyMock = JoinedRoomProxyMock(.init())
let mockController = MockTimelineController()
mockController.roomProxy = proxyMock
let mockController = MockTimelineController(roomProxy: proxyMock)
let mock = TimelineViewModel(roomProxy: proxyMock,
timelineController: mockController,
userSession: UserSessionMock(.init()),
@@ -216,8 +211,7 @@ struct PillContextTests {
let userIndicatorController = UserIndicatorControllerMock()
let proxyMock = JoinedRoomProxyMock(.init())
let mockController = MockTimelineController()
mockController.roomProxy = proxyMock
let mockController = MockTimelineController(roomProxy: proxyMock)
let clientMock = ClientProxyMock(.init())
clientMock.roomSummaryForIdentifierReturnValue = .mock(id: "1", name: "Foundation 🔭🪐🌌")
let mock = TimelineViewModel(roomProxy: proxyMock,
@@ -244,8 +238,7 @@ struct PillContextTests {
let userIndicatorController = UserIndicatorControllerMock()
let proxyMock = JoinedRoomProxyMock(.init())
let mockController = MockTimelineController()
mockController.roomProxy = proxyMock
let mockController = MockTimelineController(roomProxy: proxyMock)
let mock = TimelineViewModel(roomProxy: proxyMock,
timelineController: mockController,
userSession: UserSessionMock(.init()),
@@ -270,8 +263,7 @@ struct PillContextTests {
let userIndicatorController = UserIndicatorControllerMock()
let proxyMock = JoinedRoomProxyMock(.init())
let mockController = MockTimelineController()
mockController.roomProxy = proxyMock
let mockController = MockTimelineController(roomProxy: proxyMock)
let clientMock = ClientProxyMock(.init())
clientMock.roomSummaryForAliasReturnValue = .mock(id: "2",
name: "Foundation and Empire",
@@ -300,8 +292,7 @@ struct PillContextTests {
let userIndicatorController = UserIndicatorControllerMock()
let proxyMock = JoinedRoomProxyMock(.init())
let mockController = MockTimelineController()
mockController.roomProxy = proxyMock
let mockController = MockTimelineController(roomProxy: proxyMock)
let mock = TimelineViewModel(roomProxy: proxyMock,
timelineController: mockController,
userSession: UserSessionMock(.init()),
UnitTests/Sources/TimelineMediaPreviewViewModelTests.swift
+1 -2
View File
@@ -292,8 +292,7 @@ struct TimelineMediaPreviewViewModelTests {
private mutating func setupViewModel(initialItemIndex: Int = 0, photoLibraryAuthorizationDenied: Bool = false) {
let initialItems = makeItems()
timelineController = MockTimelineController(timelineKind: .media(.mediaFilesScreen))
timelineController.timelineItems = initialItems
timelineController = MockTimelineController(timelineKind: .media(.mediaFilesScreen), timelineItems: initialItems)
mediaProvider = MediaProviderMock(.init())
photoLibraryManager = PhotoLibraryManagerMock(.init(authorizationDenied: photoLibraryAuthorizationDenied))
UnitTests/Sources/TimelineViewModelTests.swift
+15 -30
View File
@@ -35,8 +35,7 @@ final class TimelineViewModelTests {
]
// When showing them in a timeline.
let timelineController = MockTimelineController()
timelineController.timelineItems = items
let timelineController = MockTimelineController(timelineItems: items)
let viewModel = makeViewModel(timelineController: timelineController)
// Then the messages should be grouped together.
@@ -64,8 +63,7 @@ final class TimelineViewModelTests {
]
// When showing them in a timeline.
let timelineController = MockTimelineController()
timelineController.timelineItems = items
let timelineController = MockTimelineController(timelineItems: items)
let viewModel = makeViewModel(timelineController: timelineController)
// Then the messages should be grouped by sender.
@@ -91,8 +89,7 @@ final class TimelineViewModelTests {
]
// When showing them in a timeline.
let timelineController = MockTimelineController()
timelineController.timelineItems = items
let timelineController = MockTimelineController(timelineItems: items)
let viewModel = makeViewModel(timelineController: timelineController)
// Then the first message should not be grouped but the other two should.
@@ -115,8 +112,7 @@ final class TimelineViewModelTests {
]
// When showing them in a timeline.
let timelineController = MockTimelineController()
timelineController.timelineItems = items
let timelineController = MockTimelineController(timelineItems: items)
let viewModel = makeViewModel(timelineController: timelineController)
// Then the first and second messages should be grouped and the last one should not.
@@ -139,8 +135,7 @@ final class TimelineViewModelTests {
]
// When showing them in a timeline.
let timelineController = MockTimelineController()
timelineController.timelineItems = items
let timelineController = MockTimelineController(timelineItems: items)
let viewModel = makeViewModel(timelineController: timelineController)
// Then the messages should be grouped together.
@@ -157,8 +152,7 @@ final class TimelineViewModelTests {
let items = [TextRoomTimelineItem(eventID: "t1"),
TextRoomTimelineItem(eventID: "t2"),
TextRoomTimelineItem(eventID: "t3")]
let timelineController = MockTimelineController()
timelineController.timelineItems = items
let timelineController = MockTimelineController(timelineItems: items)
let viewModel = makeViewModel(timelineController: timelineController)
#expect(timelineController.focusOnEventCallCount == 0)
@@ -182,8 +176,7 @@ final class TimelineViewModelTests {
let items = [TextRoomTimelineItem(eventID: "t1"),
TextRoomTimelineItem(eventID: "t2"),
TextRoomTimelineItem(eventID: "t3")]
let timelineController = MockTimelineController()
timelineController.timelineItems = items
let timelineController = MockTimelineController(timelineItems: items)
let viewModel = makeViewModel(timelineController: timelineController)
#expect(timelineController.focusOnEventCallCount == 0)
@@ -207,8 +200,7 @@ final class TimelineViewModelTests {
let items = [TextRoomTimelineItem(eventID: "t1"),
TextRoomTimelineItem(eventID: "t2"),
TextRoomTimelineItem(eventID: "t3")]
let timelineController = MockTimelineController()
timelineController.timelineItems = items
let timelineController = MockTimelineController(timelineItems: items)
let viewModel = makeViewModel(timelineController: timelineController)
@@ -294,17 +286,13 @@ final class TimelineViewModelTests {
JoinedRoomProxyMock,
TimelineProxyMock,
MockTimelineController) {
let roomProxy = JoinedRoomProxyMock(.init(name: ""))
let timelineProxy = TimelineProxyMock()
roomProxy.timeline = timelineProxy
let timelineController = MockTimelineController()
timelineProxy.sendReadReceiptForTypeReturnValue = .success(())
timelineController.timelineItems = items
timelineController.roomProxy = roomProxy
let roomProxy = JoinedRoomProxyMock(.init(name: ""))
roomProxy.timeline = timelineProxy
let timelineController = MockTimelineController(roomProxy: roomProxy, timelineItems: items)
let appSettings = AppSettings.volatile()
@@ -335,8 +323,7 @@ final class TimelineViewModelTests {
let appSettings = AppSettings.volatile()
// When showing them in a timeline.
let timelineController = MockTimelineController()
timelineController.timelineItems = [message]
let timelineController = MockTimelineController(timelineItems: [message])
let viewModel = TimelineViewModel(roomProxy: JoinedRoomProxyMock(.init(name: "", members: [RoomMemberProxyMock.mockAlice, RoomMemberProxyMock.mockCharlie])),
timelineController: timelineController,
userSession: UserSessionMock(.init()),
@@ -556,8 +543,7 @@ final class TimelineViewModelTests {
func tapSendInfoEncryptionAuthentictyDisplaysAlert() {
// Given a room with an event whose authenticity could not be verified
let items = [TextRoomTimelineItem(eventID: "t1", encryptionAuthenticity: .verificationViolation(color: .red))]
let timelineController = MockTimelineController()
timelineController.timelineItems = items
let timelineController = MockTimelineController(timelineItems: items)
let viewModel = makeViewModel(timelineController: timelineController)
#expect(viewModel.state.bindings.alertInfo == nil)
@@ -571,8 +557,7 @@ final class TimelineViewModelTests {
func tapSendInfoEncryptionForwarderDisplaysAlert() {
// Given a room with an event whose key was forwarded
let items = [TextRoomTimelineItem(eventID: "t1", keyForwarder: .test)]
let timelineController = MockTimelineController()
timelineController.timelineItems = items
let timelineController = MockTimelineController(timelineItems: items)
let viewModel = makeViewModel(timelineController: timelineController)
#expect(viewModel.state.bindings.alertInfo == nil)