ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all underlyingFoo mock property usage (unnecessary)

Browse Source
This commit is contained in:
Stefan Ceriu
2026-06-02 16:00:56 +03:00
parent dc91a0d5e9
commit a6cad41b12
38 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Mocks/AppMediatorMock.swift
+4 -4
View File
@@ -18,13 +18,13 @@ extension AppMediatorMock {
convenience init(_ configuration: Configuration) { convenience init(_ configuration: Configuration) {
self.init() self.init()
underlyingAppState = configuration.appState appState = configuration.appState
requestAuthorizationIfNeededUnderlyingReturnValue = configuration.isCameraAuthorized requestAuthorizationIfNeededReturnValue = configuration.isCameraAuthorized
underlyingNetworkMonitor = configuration.networkMonitor networkMonitor = configuration.networkMonitor
let windowManagerMock = WindowManagerMock() let windowManagerMock = WindowManagerMock()
windowManagerMock.closeAllSecondaryWindowsClosure = { } windowManagerMock.closeAllSecondaryWindowsClosure = { }
windowManagerMock.closeSecondaryWindowForTypeClosure = { _ in } windowManagerMock.closeSecondaryWindowForTypeClosure = { _ in }
underlyingWindowManager = windowManagerMock windowManager = windowManagerMock
} }
} }
ElementX/Sources/Mocks/CLLocationManagerMock.swift
+2 -2
View File
@@ -16,7 +16,7 @@ extension CLLocationManagerMock {
convenience init(_ configuration: Configuration) { convenience init(_ configuration: Configuration) {
self.init() self.init()
underlyingAuthorizationStatus = configuration.authorizationStatus authorizationStatus = configuration.authorizationStatus
underlyingAccuracyAuthorization = configuration.accuracyAuthorization accuracyAuthorization = configuration.accuracyAuthorization
} }
} }
ElementX/Sources/Mocks/ClientProxyMock.swift
+2 -2
View File
@@ -157,8 +157,8 @@ extension ClientProxyMock {
underlyingIsLiveKitRTCSupported = true underlyingIsLiveKitRTCSupported = true
underlyingIsLoginWithQRCodeSupported = true underlyingIsLoginWithQRCodeSupported = true
underlyingTimelineMediaVisibilityPublisher = CurrentValueSubject<TimelineMediaVisibility, Never>(configuration.timelineMediaVisibility).asCurrentValuePublisher() timelineMediaVisibilityPublisher = CurrentValueSubject<TimelineMediaVisibility, Never>(configuration.timelineMediaVisibility).asCurrentValuePublisher()
underlyingHideInviteAvatarsPublisher = CurrentValueSubject<Bool, Never>(configuration.hideInviteAvatars).asCurrentValuePublisher() hideInviteAvatarsPublisher = CurrentValueSubject<Bool, Never>(configuration.hideInviteAvatars).asCurrentValuePublisher()
liveLocationOwnInfoUpdatesPublisher = PassthroughSubject<LiveLocationOwnInfoUpdate, Never>().eraseToAnyPublisher() liveLocationOwnInfoUpdatesPublisher = PassthroughSubject<LiveLocationOwnInfoUpdate, Never>().eraseToAnyPublisher()
ElementX/Sources/Mocks/ElementCallServiceMock.swift
+2 -2
View File
@@ -17,7 +17,7 @@ extension ElementCallServiceMock {
convenience init(_ configuration: ElementCallServiceMockConfiguration) { convenience init(_ configuration: ElementCallServiceMockConfiguration) {
self.init() self.init()
underlyingActions = PassthroughSubject().eraseToAnyPublisher() actions = PassthroughSubject().eraseToAnyPublisher()
underlyingOngoingCallRoomIDPublisher = .init(.init(configuration.ongoingCallRoomID)) ongoingCallRoomIDPublisher = .init(.init(configuration.ongoingCallRoomID))
} }
} }
ElementX/Sources/Mocks/JoinedRoomProxyMock.swift
+3 -3
View File
@@ -132,14 +132,14 @@ extension JoinedRoomProxyMock {
unbanUserReturnValue = .success(()) unbanUserReturnValue = .success(())
let widgetDriver = ElementCallWidgetDriverMock() let widgetDriver = ElementCallWidgetDriverMock()
widgetDriver.underlyingMessagePublisher = .init() widgetDriver.messagePublisher = .init()
widgetDriver.underlyingActions = PassthroughSubject().eraseToAnyPublisher() widgetDriver.actions = PassthroughSubject().eraseToAnyPublisher()
guard let url = URL(string: "https://call.element.io/\(UUID().uuidString)#?appPrompt=false") else { guard let url = URL(string: "https://call.element.io/\(UUID().uuidString)#?appPrompt=false") else {
fatalError() fatalError()
} }
widgetDriver.startBaseURLClientIDColorSchemeVoiceOnlyRageshakeURLAnalyticsConfigurationUnderlyingReturnValue = .success(url) widgetDriver.startBaseURLClientIDColorSchemeVoiceOnlyRageshakeURLAnalyticsConfigurationReturnValue = .success(url)
elementCallWidgetDriverDeviceIDReturnValue = widgetDriver elementCallWidgetDriverDeviceIDReturnValue = widgetDriver
ElementX/Sources/Mocks/LiveLocationManagerMock.swift
+2 -2
View File
@@ -19,11 +19,11 @@ extension LiveLocationManagerMock {
self.init() self.init()
let authorizationStatusSubject = CurrentValueSubject<CLAuthorizationStatus, Never>(configuration.authorizationStatus) let authorizationStatusSubject = CurrentValueSubject<CLAuthorizationStatus, Never>(configuration.authorizationStatus)
underlyingAuthorizationStatus = .init(authorizationStatusSubject) authorizationStatus = .init(authorizationStatusSubject)
requestAlwaysAuthorizationIfPossibleReturnValue = configuration.requestAlwaysAuthorizationIfPossibleReturnValue requestAlwaysAuthorizationIfPossibleReturnValue = configuration.requestAlwaysAuthorizationIfPossibleReturnValue
startLiveLocationRoomIDDurationReturnValue = .success(()) startLiveLocationRoomIDDurationReturnValue = .success(())
underlyingHasDisplayedLiveLocationDisclaimer = configuration.hasDisplayedLiveLocationDisclaimer hasDisplayedLiveLocationDisclaimer = configuration.hasDisplayedLiveLocationDisclaimer
} }
} }
ElementX/Sources/Mocks/NSEUserSessionMock.swift
+1 -1
View File
@@ -19,6 +19,6 @@ extension NSEUserSessionMock {
underlyingInviteAvatarsVisibility = configuration.inviteAvatarsVisibility underlyingInviteAvatarsVisibility = configuration.inviteAvatarsVisibility
underlyingMediaPreviewVisibility = configuration.mediaPreviewVisibility underlyingMediaPreviewVisibility = configuration.mediaPreviewVisibility
underlyingThreadsEnabled = configuration.threadsEnabled threadsEnabled = configuration.threadsEnabled
} }
} }
ElementX/Sources/Mocks/NetworkMonitorMock.swift
+1 -1
View File
@@ -17,6 +17,6 @@ extension NetworkMonitorMock {
convenience init(_ configuration: Configuration) { convenience init(_ configuration: Configuration) {
self.init() self.init()
underlyingReachabilityPublisher = configuration.reachabilityPublisher reachabilityPublisher = configuration.reachabilityPublisher
} }
} }
ElementX/Sources/Mocks/NotificationItemProxyMock.swift
+11 -11
View File
@@ -16,7 +16,7 @@ struct NotificationItemProxyMockConfiguration {
let messageType = MessageType.text(content: TextMessageContent(body: "Hello world!", formatted: nil)) let messageType = MessageType.text(content: TextMessageContent(body: "Hello world!", formatted: nil))
let messageLikeContent = MessageLikeEventContent.roomMessage(messageType: messageType, inReplyToEventId: nil) let messageLikeContent = MessageLikeEventContent.roomMessage(messageType: messageType, inReplyToEventId: nil)
let event = TimelineEventSDKMock() let event = TimelineEventSDKMock()
event.eventIdUnderlyingReturnValue = UUID().uuidString event.eventIdReturnValue = UUID().uuidString
event.contentReturnValue = .messageLike(content: messageLikeContent) event.contentReturnValue = .messageLike(content: messageLikeContent)
return .timeline(event: event) return .timeline(event: event)
}() }()
@@ -40,18 +40,18 @@ extension NotificationItemProxyMock {
convenience init(_ configuration: NotificationItemProxyMockConfiguration) { convenience init(_ configuration: NotificationItemProxyMockConfiguration) {
self.init() self.init()
event = configuration.event event = configuration.event
underlyingSenderID = configuration.senderID senderID = configuration.senderID
underlyingRoomID = configuration.roomID roomID = configuration.roomID
underlyingReceiverID = configuration.receiverID receiverID = configuration.receiverID
senderDisplayName = configuration.senderDisplayName senderDisplayName = configuration.senderDisplayName
roomAvatarMediaSource = configuration.roomAvatarMediaSource roomAvatarMediaSource = configuration.roomAvatarMediaSource
underlyingRoomDisplayName = configuration.roomDisplayName roomDisplayName = configuration.roomDisplayName
underlyingRoomJoinedMembers = configuration.roomJoinedMembers roomJoinedMembers = configuration.roomJoinedMembers
underlyingIsRoomDirect = configuration.isRoomDirect isRoomDirect = configuration.isRoomDirect
underlyingIsRoomPrivate = configuration.isRoomPrivate isRoomPrivate = configuration.isRoomPrivate
underlyingIsNoisy = configuration.isNoisy isNoisy = configuration.isNoisy
underlyingHasMention = configuration.hasMention hasMention = configuration.hasMention
threadRootEventID = configuration.threadRootEventID threadRootEventID = configuration.threadRootEventID
underlyingIsDM = configuration.isRoomDirect && configuration.roomJoinedMembers <= 2 isDM = configuration.isRoomDirect && configuration.roomJoinedMembers <= 2
} }
} }
ElementX/Sources/Mocks/RoomPowerLevelsProxyMock.swift
+1 -1
View File
@@ -26,7 +26,7 @@ extension RoomPowerLevelsProxyMock {
convenience init(_ configuration: Configuration) { convenience init(_ configuration: Configuration) {
self.init() self.init()
underlyingValues = RoomPowerLevelsValues.mock values = RoomPowerLevelsValues.mock
canOwnUserSendMessageReturnValue = configuration.canUserSendMessage canOwnUserSendMessageReturnValue = configuration.canUserSendMessage
canOwnUserSendStateEventReturnValue = configuration.canUserSendState canOwnUserSendStateEventReturnValue = configuration.canUserSendState
ElementX/Sources/Mocks/RoomPreviewProxyMock.swift
+13 -13
View File
@@ -70,19 +70,19 @@ extension RoomPreviewProxyMock {
convenience init(_ configuration: RoomPreviewProxyMock.Configuration) { convenience init(_ configuration: RoomPreviewProxyMock.Configuration) {
self.init() self.init()
underlyingInfo = .init(roomPreviewInfo: .init(roomId: configuration.roomID, info = .init(roomPreviewInfo: .init(roomId: configuration.roomID,
canonicalAlias: configuration.canonicalAlias, canonicalAlias: configuration.canonicalAlias,
name: configuration.name, name: configuration.name,
topic: configuration.topic, topic: configuration.topic,
avatarUrl: configuration.avatarURL, avatarUrl: configuration.avatarURL,
numJoinedMembers: configuration.numJoinedMembers, numJoinedMembers: configuration.numJoinedMembers,
numActiveMembers: configuration.numActiveMembers, numActiveMembers: configuration.numActiveMembers,
roomType: configuration.roomType, roomType: configuration.roomType,
isHistoryWorldReadable: nil, isHistoryWorldReadable: nil,
membership: configuration.membership, membership: configuration.membership,
joinRule: configuration.joinRule.rustValue, joinRule: configuration.joinRule.rustValue,
isDirect: configuration.isDirect, isDirect: configuration.isDirect,
heroes: nil)) heroes: nil))
let roomMembershipDetails = RoomMembershipDetailsProxyMock() let roomMembershipDetails = RoomMembershipDetailsProxyMock()
ElementX/Sources/Mocks/SecureBackupControllerMock.swift
+2 -2
View File
@@ -19,10 +19,10 @@ extension SecureBackupControllerMock {
self.init() self.init()
let recoveryStateSubject = CurrentValueSubject<SecureBackupRecoveryState, Never>(configuration.recoveryState) let recoveryStateSubject = CurrentValueSubject<SecureBackupRecoveryState, Never>(configuration.recoveryState)
underlyingRecoveryState = .init(recoveryStateSubject) recoveryState = .init(recoveryStateSubject)
let keyBackupStateSubject = CurrentValueSubject<SecureBackupKeyBackupState, Never>(configuration.keyBackupState) let keyBackupStateSubject = CurrentValueSubject<SecureBackupKeyBackupState, Never>(configuration.keyBackupState)
underlyingKeyBackupState = .init(keyBackupStateSubject) keyBackupState = .init(keyBackupStateSubject)
disableClosure = { disableClosure = {
recoveryStateSubject.send(.disabled) recoveryStateSubject.send(.disabled)
ElementX/Sources/Mocks/SessionVerificationControllerProxyMock.swift
+1 -1
View File
@@ -22,7 +22,7 @@ extension SessionVerificationControllerProxyMock {
otherDeviceStartsSasVerification: Bool = false, otherDeviceStartsSasVerification: Bool = false,
requestDelay: Duration = .seconds(1)) -> SessionVerificationControllerProxyMock { requestDelay: Duration = .seconds(1)) -> SessionVerificationControllerProxyMock {
let mock = SessionVerificationControllerProxyMock() let mock = SessionVerificationControllerProxyMock()
mock.underlyingActions = actions mock.actions = actions
mock.acknowledgeVerificationRequestDetailsReturnValue = .success(()) mock.acknowledgeVerificationRequestDetailsReturnValue = .success(())
ElementX/Sources/Mocks/SignallingTimelineItemProviderMock.swift
+6 -6
View File
@@ -34,10 +34,10 @@ class SignallingTimelineItemProviderMock: TimelineItemProviderMock {
self.itemProxies = itemProxies self.itemProxies = itemProxies
underlyingPaginationState = paginationState self.paginationState = paginationState
underlyingKind = .live kind = .live
underlyingUpdatePublisher = stateSubject.eraseToAnyPublisher() updatePublisher = stateSubject.eraseToAnyPublisher()
underlyingMembershipChangePublisher = Empty().eraseToAnyPublisher() membershipChangePublisher = Empty().eraseToAnyPublisher()
guard listenForSignals else { return } guard listenForSignals else { return }
@@ -102,7 +102,7 @@ class SignallingTimelineItemProviderMock: TimelineItemProviderMock {
guard !backPaginationResponses.isEmpty else { guard !backPaginationResponses.isEmpty else {
let newState = TimelinePaginationState(backward: .endReached, forward: .endReached) let newState = TimelinePaginationState(backward: .endReached, forward: .endReached)
underlyingPaginationState = newState paginationState = newState
stateSubject.send((items, newState)) stateSubject.send((items, newState))
return return
} }
@@ -111,7 +111,7 @@ class SignallingTimelineItemProviderMock: TimelineItemProviderMock {
let newPaginationState = TimelinePaginationState(backward: backPaginationResponses.isEmpty ? .endReached : .idle, let newPaginationState = TimelinePaginationState(backward: backPaginationResponses.isEmpty ? .endReached : .idle,
forward: .endReached) forward: .endReached)
itemProxies = newItems + items itemProxies = newItems + items
underlyingPaginationState = newPaginationState paginationState = newPaginationState
stateSubject.send((newItems + items, newPaginationState)) stateSubject.send((newItems + items, newPaginationState))
try client?.send(.success) try client?.send(.success)
} }
ElementX/Sources/Mocks/TimelineControllerMock.swift
+4 -4
View File
@@ -43,10 +43,10 @@ extension TimelineControllerMock {
let timelineProxy = configuration.timelineProxy let timelineProxy = configuration.timelineProxy
let timelineItemsTimestamps = configuration.timelineItemsTimestamps let timelineItemsTimestamps = configuration.timelineItemsTimestamps
underlyingCallbacks = PassthroughSubject() callbacks = PassthroughSubject()
underlyingRoomID = roomProxy?.id ?? "MockRoomIdentifier" roomID = roomProxy?.id ?? "MockRoomIdentifier"
underlyingTimelineKind = configuration.timelineKind timelineKind = configuration.timelineKind
underlyingPaginationState = configuration.paginationState paginationState = configuration.paginationState
timelineItems = configuration.timelineItems timelineItems = configuration.timelineItems
callbacks.send(.paginationState(configuration.paginationState)) callbacks.send(.paginationState(configuration.paginationState))
ElementX/Sources/Mocks/TimelineProxyMock.swift
+6 -6
View File
@@ -32,14 +32,14 @@ extension TimelineProxyMock {
editPollOriginalQuestionAnswersPollKindReturnValue = .success(()) editPollOriginalQuestionAnswersPollKindReturnValue = .success(())
if let provider = configuration.timelineItemProvider { if let provider = configuration.timelineItemProvider {
underlyingTimelineItemProvider = provider timelineItemProvider = provider
} else if configuration.isAutoUpdating { } else if configuration.isAutoUpdating {
underlyingTimelineItemProvider = AutoUpdatingTimelineItemProviderMock() timelineItemProvider = AutoUpdatingTimelineItemProviderMock()
} else { } else {
let timelineItemProvider = TimelineItemProviderMock() let provider = TimelineItemProviderMock()
timelineItemProvider.paginationState = .init(backward: configuration.timelineStartReached ? .endReached : .idle, forward: .endReached) provider.paginationState = .init(backward: configuration.timelineStartReached ? .endReached : .idle, forward: .endReached)
timelineItemProvider.underlyingMembershipChangePublisher = PassthroughSubject().eraseToAnyPublisher() provider.membershipChangePublisher = PassthroughSubject().eraseToAnyPublisher()
underlyingTimelineItemProvider = timelineItemProvider timelineItemProvider = provider
} }
} }
} }
ElementX/Sources/Mocks/UserIdentityProxyMock.swift
+1 -1
View File
@@ -14,6 +14,6 @@ extension UserIdentityProxyMock {
convenience init(_ configuration: Configuration) { convenience init(_ configuration: Configuration) {
self.init() self.init()
underlyingVerificationState = configuration.verificationState verificationState = configuration.verificationState
} }
} }
ElementX/Sources/Screens/CallScreen/View/CallScreen.swift
+2 -2
View File
@@ -358,8 +358,8 @@ struct CallScreen_Previews: PreviewProvider {
let roomProxy = JoinedRoomProxyMock() let roomProxy = JoinedRoomProxyMock()
let widgetDriver = ElementCallWidgetDriverMock() let widgetDriver = ElementCallWidgetDriverMock()
widgetDriver.underlyingMessagePublisher = .init() widgetDriver.messagePublisher = .init()
widgetDriver.underlyingActions = PassthroughSubject<ElementCallWidgetDriverAction, Never>().eraseToAnyPublisher() widgetDriver.actions = PassthroughSubject<ElementCallWidgetDriverAction, Never>().eraseToAnyPublisher()
widgetDriver.startBaseURLClientIDColorSchemeVoiceOnlyRageshakeURLAnalyticsConfigurationReturnValue = .success(URL.userDirectory) widgetDriver.startBaseURLClientIDColorSchemeVoiceOnlyRageshakeURLAnalyticsConfigurationReturnValue = .success(URL.userDirectory)
roomProxy.elementCallWidgetDriverDeviceIDReturnValue = widgetDriver roomProxy.elementCallWidgetDriverDeviceIDReturnValue = widgetDriver
ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift
+1 -1
View File
@@ -98,7 +98,7 @@ struct SecureBackupKeyBackupScreen_Previews: PreviewProvider, TestablePreview {
static func viewModel(keyBackupState: SecureBackupKeyBackupState) -> SecureBackupKeyBackupScreenViewModelType { static func viewModel(keyBackupState: SecureBackupKeyBackupState) -> SecureBackupKeyBackupScreenViewModelType {
let backupController = SecureBackupControllerMock() let backupController = SecureBackupControllerMock()
backupController.underlyingKeyBackupState = CurrentValueSubject<SecureBackupKeyBackupState, Never>(keyBackupState).asCurrentValuePublisher() backupController.keyBackupState = CurrentValueSubject<SecureBackupKeyBackupState, Never>(keyBackupState).asCurrentValuePublisher()
return SecureBackupKeyBackupScreenViewModel(secureBackupController: backupController, return SecureBackupKeyBackupScreenViewModel(secureBackupController: backupController,
userIndicatorController: nil) userIndicatorController: nil)
ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/View/SecureBackupLogoutConfirmationScreen.swift
+1 -1
View File
@@ -150,7 +150,7 @@ struct SecureBackupLogoutConfirmationScreen_Previews: PreviewProvider, TestableP
static func makeViewModel(mode: SecureBackupLogoutConfirmationScreenViewMode) -> SecureBackupLogoutConfirmationScreenViewModel { static func makeViewModel(mode: SecureBackupLogoutConfirmationScreenViewMode) -> SecureBackupLogoutConfirmationScreenViewModel {
let secureBackupController = SecureBackupControllerMock() let secureBackupController = SecureBackupControllerMock()
secureBackupController.underlyingKeyBackupState = CurrentValueSubject<SecureBackupKeyBackupState, Never>(.enabled).asCurrentValuePublisher() secureBackupController.keyBackupState = CurrentValueSubject<SecureBackupKeyBackupState, Never>(.enabled).asCurrentValuePublisher()
secureBackupController.waitForKeyBackupUploadUploadStateSubjectClosure = { uploadStateSubject in secureBackupController.waitForKeyBackupUploadUploadStateSubjectClosure = { uploadStateSubject in
if case .backupOngoing = mode { if case .backupOngoing = mode {
ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift
+1 -1
View File
@@ -275,7 +275,7 @@ struct SecureBackupRecoveryKeyScreen_Previews: PreviewProvider, TestablePreview
static func viewModel(recoveryState: SecureBackupRecoveryState, generateKey: Bool = false, key: String? = nil) -> SecureBackupRecoveryKeyScreenViewModelType { static func viewModel(recoveryState: SecureBackupRecoveryState, generateKey: Bool = false, key: String? = nil) -> SecureBackupRecoveryKeyScreenViewModelType {
let backupController = SecureBackupControllerMock() let backupController = SecureBackupControllerMock()
backupController.underlyingRecoveryState = CurrentValueSubject<SecureBackupRecoveryState, Never>(recoveryState).asCurrentValuePublisher() backupController.recoveryState = CurrentValueSubject<SecureBackupRecoveryState, Never>(recoveryState).asCurrentValuePublisher()
if let key { if let key {
backupController.generateRecoveryKeyReturnValue = .success(key) backupController.generateRecoveryKeyReturnValue = .success(key)
ElementX/Sources/Screens/SecureBackup/SecureBackupScreen/View/SecureBackupScreen.swift
+2 -2
View File
@@ -151,8 +151,8 @@ struct SecureBackupScreen_Previews: PreviewProvider, TestablePreview {
static func viewModel(keyBackupState: SecureBackupKeyBackupState, static func viewModel(keyBackupState: SecureBackupKeyBackupState,
recoveryState: SecureBackupRecoveryState) -> SecureBackupScreenViewModelType { recoveryState: SecureBackupRecoveryState) -> SecureBackupScreenViewModelType {
let backupController = SecureBackupControllerMock() let backupController = SecureBackupControllerMock()
backupController.underlyingKeyBackupState = CurrentValueSubject<SecureBackupKeyBackupState, Never>(keyBackupState).asCurrentValuePublisher() backupController.keyBackupState = CurrentValueSubject<SecureBackupKeyBackupState, Never>(keyBackupState).asCurrentValuePublisher()
backupController.underlyingRecoveryState = CurrentValueSubject<SecureBackupRecoveryState, Never>(recoveryState).asCurrentValuePublisher() backupController.recoveryState = CurrentValueSubject<SecureBackupRecoveryState, Never>(recoveryState).asCurrentValuePublisher()
return SecureBackupScreenViewModel(secureBackupController: backupController, return SecureBackupScreenViewModel(secureBackupController: backupController,
userIndicatorController: UserIndicatorControllerMock(), userIndicatorController: UserIndicatorControllerMock(),
ElementX/Sources/Services/AppLock/AppLockServiceProtocol.swift
+2 -2
View File
@@ -88,8 +88,8 @@ extension AppLockServiceMock {
mock.isEnabled = pinCode != nil mock.isEnabled = pinCode != nil
mock.isMandatory = isMandatory mock.isMandatory = isMandatory
mock.numberOfPINAttempts = CurrentValueSubject<Int, Never>(numberOfPINAttempts).eraseToAnyPublisher() mock.numberOfPINAttempts = CurrentValueSubject<Int, Never>(numberOfPINAttempts).eraseToAnyPublisher()
mock.underlyingBiometryType = biometryType mock.biometryType = biometryType
mock.underlyingBiometricUnlockEnabled = biometryType != .none mock.biometricUnlockEnabled = biometryType != .none
mock.unlockWithClosure = { $0 == pinCode } mock.unlockWithClosure = { $0 == pinCode }
return mock return mock
} }
ElementX/Sources/UITests/UITestsAppCoordinator.swift
+1 -1
View File
@@ -632,7 +632,7 @@ class MockScreen: Identifiable {
clientProxy.spaceService = spaceServiceProxy clientProxy.spaceService = spaceServiceProxy
let appMediator = AppMediatorMock(.init()) let appMediator = AppMediatorMock(.init())
appMediator.underlyingWindowManager = windowManager appMediator.windowManager = windowManager
let itemProvider = SignallingTimelineItemProviderMock(itemProxies: RoomTimelineItemFixtures.largeChunkProxies) let itemProvider = SignallingTimelineItemProviderMock(itemProxies: RoomTimelineItemFixtures.largeChunkProxies)
UnitTests/Sources/AppLock/AppLockSetupBiometricsScreenViewModelTests.swift
+2 -2
View File
@@ -20,8 +20,8 @@ final class AppLockSetupBiometricsScreenViewModelTests {
init() { init() {
appLockService = AppLockServiceMock() appLockService = AppLockServiceMock()
appLockService.underlyingIsEnabled = true appLockService.isEnabled = true
appLockService.underlyingBiometryType = .touchID appLockService.biometryType = .touchID
appLockService.enableBiometricUnlockReturnValue = .success(()) appLockService.enableBiometricUnlockReturnValue = .success(())
viewModel = AppLockSetupBiometricsScreenViewModel(appLockService: appLockService) viewModel = AppLockSetupBiometricsScreenViewModel(appLockService: appLockService)
} }
UnitTests/Sources/AudioPlayerStateTests.swift
+1 -1
View File
@@ -26,7 +26,7 @@ struct AudioPlayerStateTests {
private func buildAudioPlayerMock() -> AudioPlayerMock { private func buildAudioPlayerMock() -> AudioPlayerMock {
let audioPlayerMock = AudioPlayerMock() let audioPlayerMock = AudioPlayerMock()
audioPlayerMock.underlyingActions = audioPlayerActions audioPlayerMock.actions = audioPlayerActions
audioPlayerMock.state = .stopped audioPlayerMock.state = .stopped
audioPlayerMock.currentTime = 0.0 audioPlayerMock.currentTime = 0.0
audioPlayerMock.duration = 0.0 audioPlayerMock.duration = 0.0
UnitTests/Sources/AudioRecorderStateTests.swift
+1 -1
View File
@@ -24,7 +24,7 @@ struct AudioRecorderStateTests {
private func buildAudioRecorderMock() -> AudioRecorderMock { private func buildAudioRecorderMock() -> AudioRecorderMock {
let audioRecorderMock = AudioRecorderMock() let audioRecorderMock = AudioRecorderMock()
audioRecorderMock.isRecording = false audioRecorderMock.isRecording = false
audioRecorderMock.underlyingActions = audioRecorderActions audioRecorderMock.actions = audioRecorderActions
audioRecorderMock.currentTime = 0.0 audioRecorderMock.currentTime = 0.0
audioRecorderMock.averagePowerReturnValue = 0 audioRecorderMock.averagePowerReturnValue = 0
return audioRecorderMock return audioRecorderMock
UnitTests/Sources/BugReportServiceTests.swift
+1 -1
View File
@@ -20,7 +20,7 @@ final class BugReportServiceTests {
appSettings.bugReportRageshakeURL.reset() appSettings.bugReportRageshakeURL.reset()
let bugReportServiceMock = BugReportServiceMock() let bugReportServiceMock = BugReportServiceMock()
bugReportServiceMock.underlyingCrashedLastRun = false bugReportServiceMock.crashedLastRun = false
bugReportServiceMock.submitBugReportProgressListenerReturnValue = .success(SubmitBugReportResponse(reportURL: "https://www.example.com/123")) bugReportServiceMock.submitBugReportProgressListenerReturnValue = .success(SubmitBugReportResponse(reportURL: "https://www.example.com/123"))
bugReportService = bugReportServiceMock bugReportService = bugReportServiceMock
} }
UnitTests/Sources/ComposerToolbarViewModelTests.swift
+3 -3
View File
@@ -700,7 +700,7 @@ final class ComposerToolbarViewModelTests {
} }
let mockSubject = CurrentValueSubject<[IdentityStatusChange], Never>([]) let mockSubject = CurrentValueSubject<[IdentityStatusChange], Never>([])
roomProxyMock.underlyingIdentityStatusChangesPublisher = mockSubject.asCurrentValuePublisher() roomProxyMock.identityStatusChangesPublisher = mockSubject.asCurrentValuePublisher()
let appSettings = AppSettings.volatile() let appSettings = AppSettings.volatile()
@@ -747,7 +747,7 @@ final class ComposerToolbarViewModelTests {
IdentityStatusChange(userId: "@bob:localhost", changedTo: .verificationViolation) IdentityStatusChange(userId: "@bob:localhost", changedTo: .verificationViolation)
]) ])
roomProxyMock.underlyingIdentityStatusChangesPublisher = mockSubject.asCurrentValuePublisher() roomProxyMock.identityStatusChangesPublisher = mockSubject.asCurrentValuePublisher()
let appSettings = AppSettings.volatile() let appSettings = AppSettings.volatile()
@@ -784,7 +784,7 @@ final class ComposerToolbarViewModelTests {
.success(roomMemberProxyMock) .success(roomMemberProxyMock)
} }
roomProxyMock.underlyingIdentityStatusChangesPublisher = CurrentValueSubject([IdentityStatusChange(userId: "@alice:localhost", changedTo: .pinViolation)]).asCurrentValuePublisher() roomProxyMock.identityStatusChangesPublisher = CurrentValueSubject([IdentityStatusChange(userId: "@alice:localhost", changedTo: .pinViolation)]).asCurrentValuePublisher()
let appSettings = AppSettings.volatile() let appSettings = AppSettings.volatile()
viewModel = ComposerToolbarViewModel(roomProxy: roomProxyMock, viewModel = ComposerToolbarViewModel(roomProxy: roomProxyMock,
UnitTests/Sources/HomeScreenViewModelTests.swift
+1 -1
View File
@@ -420,7 +420,7 @@ final class HomeScreenViewModelTests {
spaceServiceProxy.spaceRoomListSpaceIDClosure = { spaceID in spaceServiceProxy.spaceRoomListSpaceIDClosure = { spaceID in
.success(SpaceRoomListProxyMock(.init(spaceServiceRoom: SpaceServiceRoom.mock(id: spaceID, isSpace: true)))) .success(SpaceRoomListProxyMock(.init(spaceServiceRoom: SpaceServiceRoom.mock(id: spaceID, isSpace: true))))
} }
clientProxy.underlyingSpaceService = spaceServiceProxy clientProxy.spaceService = spaceServiceProxy
case nil: case nil:
break break
} }
UnitTests/Sources/JoinRoomScreenViewModelTests.swift
+1 -1
View File
@@ -179,7 +179,7 @@ final class JoinRoomScreenViewModelTests {
clientProxy.roomForIdentifierClosure = { _ in clientProxy.roomForIdentifierClosure = { _ in
let roomProxy = KnockedRoomProxyMock(.init()) let roomProxy = KnockedRoomProxyMock(.init())
// to test the cancel knock function // to test the cancel knock function
roomProxy.cancelKnockUnderlyingReturnValue = .success(()) roomProxy.cancelKnockReturnValue = .success(())
return .knocked(roomProxy) return .knocked(roomProxy)
} }
case .joined: case .joined:
UnitTests/Sources/LocationSharingScreenViewModelTests.swift
+1 -1
View File
@@ -219,7 +219,7 @@ struct LocationSharingScreenViewModelTests {
mutating func startLiveLocationWithNotDeterminedAuthorizationTransitionsToWhenInUse() async { mutating func startLiveLocationWithNotDeterminedAuthorizationTransitionsToWhenInUse() async {
let authorizationStatusSubject = CurrentValueSubject<CLAuthorizationStatus, Never>(.notDetermined) let authorizationStatusSubject = CurrentValueSubject<CLAuthorizationStatus, Never>(.notDetermined)
let liveLocationManagerMock = LiveLocationManagerMock() let liveLocationManagerMock = LiveLocationManagerMock()
liveLocationManagerMock.underlyingAuthorizationStatus = .init(authorizationStatusSubject) liveLocationManagerMock.authorizationStatus = .init(authorizationStatusSubject)
liveLocationManagerMock.requestAlwaysAuthorizationIfPossibleReturnValue = true liveLocationManagerMock.requestAlwaysAuthorizationIfPossibleReturnValue = true
setupViewModel(liveLocationManagerMock: liveLocationManagerMock) setupViewModel(liveLocationManagerMock: liveLocationManagerMock)
UnitTests/Sources/RoomDetailsScreenViewModelTests.swift
+1 -1
View File
@@ -790,7 +790,7 @@ struct RoomDetailsScreenViewModelTests {
let configuration = JoinedRoomProxyMockConfiguration(historyVisibility: .shared) let configuration = JoinedRoomProxyMockConfiguration(historyVisibility: .shared)
let infoSubject = CurrentValueSubject<RoomInfoProxyProtocol, Never>(RoomInfoProxyMock(configuration)) let infoSubject = CurrentValueSubject<RoomInfoProxyProtocol, Never>(RoomInfoProxyMock(configuration))
let roomProxyMock = JoinedRoomProxyMock(configuration) let roomProxyMock = JoinedRoomProxyMock(configuration)
roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher()
viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock, viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
userSession: UserSessionMock(.init()), userSession: UserSessionMock(.init()),
UnitTests/Sources/RoomScreenViewModelTests.swift
+6 -6
View File
@@ -38,7 +38,7 @@ final class RoomScreenViewModelTests {
return .success(timeline) return .success(timeline)
} }
// setup the room proxy actions publisher // setup the room proxy actions publisher
roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher()
let viewModel = RoomScreenViewModel(userSession: UserSessionMock(.init()), let viewModel = RoomScreenViewModel(userSession: UserSessionMock(.init()),
roomProxy: roomProxyMock, roomProxy: roomProxyMock,
initialSelectedPinnedEventID: nil, initialSelectedPinnedEventID: nil,
@@ -72,7 +72,7 @@ final class RoomScreenViewModelTests {
let pinnedTimelineMock = TimelineProxyMock() let pinnedTimelineMock = TimelineProxyMock()
let pinnedTimelineItemProviderMock = TimelineItemProviderMock() let pinnedTimelineItemProviderMock = TimelineItemProviderMock()
let providerUpdateSubject = PassthroughSubject<([TimelineItemProxy], TimelinePaginationState), Never>() let providerUpdateSubject = PassthroughSubject<([TimelineItemProxy], TimelinePaginationState), Never>()
pinnedTimelineItemProviderMock.underlyingUpdatePublisher = providerUpdateSubject.eraseToAnyPublisher() pinnedTimelineItemProviderMock.updatePublisher = providerUpdateSubject.eraseToAnyPublisher()
pinnedTimelineMock.timelineItemProvider = pinnedTimelineItemProviderMock pinnedTimelineMock.timelineItemProvider = pinnedTimelineItemProviderMock
pinnedTimelineItemProviderMock.itemProxies = [.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test1")), uniqueID: .init("1"))), pinnedTimelineItemProviderMock.itemProxies = [.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test1")), uniqueID: .init("1"))),
.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test2")), uniqueID: .init("2")))] .event(.init(item: EventTimelineItem(configuration: .init(eventID: "test2")), uniqueID: .init("2")))]
@@ -115,7 +115,7 @@ final class RoomScreenViewModelTests {
let pinnedTimelineMock = TimelineProxyMock() let pinnedTimelineMock = TimelineProxyMock()
let pinnedTimelineItemProviderMock = TimelineItemProviderMock() let pinnedTimelineItemProviderMock = TimelineItemProviderMock()
pinnedTimelineMock.timelineItemProvider = pinnedTimelineItemProviderMock pinnedTimelineMock.timelineItemProvider = pinnedTimelineItemProviderMock
pinnedTimelineItemProviderMock.underlyingUpdatePublisher = Empty<([TimelineItemProxy], TimelinePaginationState), Never>().eraseToAnyPublisher() pinnedTimelineItemProviderMock.updatePublisher = Empty<([TimelineItemProxy], TimelinePaginationState), Never>().eraseToAnyPublisher()
pinnedTimelineItemProviderMock.itemProxies = [.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test1")), uniqueID: .init("1"))), pinnedTimelineItemProviderMock.itemProxies = [.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test1")), uniqueID: .init("1"))),
.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test2")), uniqueID: .init("2"))), .event(.init(item: EventTimelineItem(configuration: .init(eventID: "test2")), uniqueID: .init("2"))),
.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test3")), uniqueID: .init("3")))] .event(.init(item: EventTimelineItem(configuration: .init(eventID: "test3")), uniqueID: .init("3")))]
@@ -175,7 +175,7 @@ final class RoomScreenViewModelTests {
let pinnedTimelineMock = TimelineProxyMock() let pinnedTimelineMock = TimelineProxyMock()
let pinnedTimelineItemProviderMock = TimelineItemProviderMock() let pinnedTimelineItemProviderMock = TimelineItemProviderMock()
pinnedTimelineMock.timelineItemProvider = pinnedTimelineItemProviderMock pinnedTimelineMock.timelineItemProvider = pinnedTimelineItemProviderMock
pinnedTimelineItemProviderMock.underlyingUpdatePublisher = Empty<([TimelineItemProxy], TimelinePaginationState), Never>().eraseToAnyPublisher() pinnedTimelineItemProviderMock.updatePublisher = Empty<([TimelineItemProxy], TimelinePaginationState), Never>().eraseToAnyPublisher()
pinnedTimelineItemProviderMock.itemProxies = [.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test1")), uniqueID: .init("1"))), pinnedTimelineItemProviderMock.itemProxies = [.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test1")), uniqueID: .init("1"))),
.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test2")), uniqueID: .init("2"))), .event(.init(item: EventTimelineItem(configuration: .init(eventID: "test2")), uniqueID: .init("2"))),
.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test3")), uniqueID: .init("3")))] .event(.init(item: EventTimelineItem(configuration: .init(eventID: "test3")), uniqueID: .init("3")))]
@@ -238,7 +238,7 @@ final class RoomScreenViewModelTests {
roomInfoProxyMock.powerLevels = powerLevelsMock roomInfoProxyMock.powerLevels = powerLevelsMock
let infoSubject = CurrentValueSubject<RoomInfoProxyProtocol, Never>(roomInfoProxyMock) let infoSubject = CurrentValueSubject<RoomInfoProxyProtocol, Never>(roomInfoProxyMock)
roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher()
let viewModel = RoomScreenViewModel(userSession: UserSessionMock(.init()), let viewModel = RoomScreenViewModel(userSession: UserSessionMock(.init()),
roomProxy: roomProxyMock, roomProxy: roomProxyMock,
@@ -452,7 +452,7 @@ final class RoomScreenViewModelTests {
let roomProxyMock = JoinedRoomProxyMock(configuration) let roomProxyMock = JoinedRoomProxyMock(configuration)
// setup the room proxy actions publisher // setup the room proxy actions publisher
roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher()
let viewModel = RoomScreenViewModel(userSession: UserSessionMock(.init()), let viewModel = RoomScreenViewModel(userSession: UserSessionMock(.init()),
roomProxy: roomProxyMock, roomProxy: roomProxyMock,
initialSelectedPinnedEventID: nil, initialSelectedPinnedEventID: nil,
UnitTests/Sources/SecureBackupLogoutConfirmationScreenViewModelTests.swift
+1 -1
View File
@@ -22,7 +22,7 @@ struct SecureBackupLogoutConfirmationScreenViewModelTests {
init() { init() {
secureBackupController = SecureBackupControllerMock() secureBackupController = SecureBackupControllerMock()
secureBackupController.underlyingKeyBackupState = CurrentValueSubject<SecureBackupKeyBackupState, Never>(.enabled).asCurrentValuePublisher() secureBackupController.keyBackupState = CurrentValueSubject<SecureBackupKeyBackupState, Never>(.enabled).asCurrentValuePublisher()
reachabilitySubject = CurrentValueSubject<NetworkMonitorReachability, Never>(.reachable) reachabilitySubject = CurrentValueSubject<NetworkMonitorReachability, Never>(.reachable)
UnitTests/Sources/SpaceAddRoomsScreenViewModelTests.swift
+1 -1
View File
@@ -26,7 +26,7 @@ struct SpaceAddRoomsScreenViewModelTests {
let clientProxy = ClientProxyMock(.init()) let clientProxy = ClientProxyMock(.init())
clientProxy.recentlyVisitedRoomsFilterReturnValue = .init(repeating: JoinedRoomProxyMock(.init()), count: 5) clientProxy.recentlyVisitedRoomsFilterReturnValue = .init(repeating: JoinedRoomProxyMock(.init()), count: 5)
spaceServiceProxy = clientProxy.underlyingSpaceService as? SpaceServiceProxyMock ?? SpaceServiceProxyMock(.init()) spaceServiceProxy = clientProxy.spaceService as? SpaceServiceProxyMock ?? SpaceServiceProxyMock(.init())
viewModel = SpaceAddRoomsScreenViewModel(spaceRoomListProxy: spaceRoomListProxy, viewModel = SpaceAddRoomsScreenViewModel(spaceRoomListProxy: spaceRoomListProxy,
userSession: UserSessionMock(.init(clientProxy: clientProxy)), userSession: UserSessionMock(.init(clientProxy: clientProxy)),
UnitTests/Sources/TimelineViewModelTests.swift
+2 -2
View File
@@ -472,7 +472,7 @@ final class TimelineViewModelTests {
pinnedEventIDs: .init(["test1"])) pinnedEventIDs: .init(["test1"]))
let roomProxyMock = JoinedRoomProxyMock(configuration) let roomProxyMock = JoinedRoomProxyMock(configuration)
let infoSubject = CurrentValueSubject<RoomInfoProxyProtocol, Never>(RoomInfoProxyMock(configuration)) let infoSubject = CurrentValueSubject<RoomInfoProxyProtocol, Never>(RoomInfoProxyMock(configuration))
roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher()
let viewModel = TimelineViewModel(roomProxy: roomProxyMock, let viewModel = TimelineViewModel(roomProxy: roomProxyMock,
timelineController: TimelineControllerMock(.init()), timelineController: TimelineControllerMock(.init()),
@@ -503,7 +503,7 @@ final class TimelineViewModelTests {
powerLevelsConfiguration: .init(canUserPin: true)) powerLevelsConfiguration: .init(canUserPin: true))
let roomProxyMock = JoinedRoomProxyMock(configuration) let roomProxyMock = JoinedRoomProxyMock(configuration)
let infoSubject = CurrentValueSubject<RoomInfoProxyProtocol, Never>(RoomInfoProxyMock(configuration)) let infoSubject = CurrentValueSubject<RoomInfoProxyProtocol, Never>(RoomInfoProxyMock(configuration))
roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher()
let viewModel = TimelineViewModel(roomProxy: roomProxyMock, let viewModel = TimelineViewModel(roomProxy: roomProxyMock,
timelineController: TimelineControllerMock(.init()), timelineController: TimelineControllerMock(.init()),
UnitTests/Sources/VoiceMessageRecorderTests.swift
+1 -1
View File
@@ -35,7 +35,7 @@ struct VoiceMessageRecorderTests {
init() async throws { init() async throws {
audioRecorder = AudioRecorderMock() audioRecorder = AudioRecorderMock()
audioRecorder.underlyingCurrentTime = 0 audioRecorder.currentTime = 0
audioRecorder.averagePowerReturnValue = 0 audioRecorder.averagePowerReturnValue = 0
audioRecorder.actions = audioRecorderActions audioRecorder.actions = audioRecorderActions