From a6cad41b12454eb58eed06d9850d2ec80fc1d288 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Tue, 2 Jun 2026 16:00:56 +0300 Subject: [PATCH] Remove all underlyingFoo mock property usage (unnecessary) --- ElementX/Sources/Mocks/AppMediatorMock.swift | 8 +++--- .../Sources/Mocks/CLLocationManagerMock.swift | 4 +-- ElementX/Sources/Mocks/ClientProxyMock.swift | 4 +-- .../Mocks/ElementCallServiceMock.swift | 4 +-- .../Sources/Mocks/JoinedRoomProxyMock.swift | 6 ++--- .../Mocks/LiveLocationManagerMock.swift | 4 +-- .../Sources/Mocks/NSEUserSessionMock.swift | 2 +- .../Sources/Mocks/NetworkMonitorMock.swift | 2 +- .../Mocks/NotificationItemProxyMock.swift | 22 ++++++++-------- .../Mocks/RoomPowerLevelsProxyMock.swift | 2 +- .../Sources/Mocks/RoomPreviewProxyMock.swift | 26 +++++++++---------- .../Mocks/SecureBackupControllerMock.swift | 4 +-- ...ssionVerificationControllerProxyMock.swift | 2 +- .../SignallingTimelineItemProviderMock.swift | 12 ++++----- .../Mocks/TimelineControllerMock.swift | 8 +++--- .../Sources/Mocks/TimelineProxyMock.swift | 12 ++++----- .../Sources/Mocks/UserIdentityProxyMock.swift | 2 +- .../Screens/CallScreen/View/CallScreen.swift | 4 +-- .../View/SecureBackupKeyBackupScreen.swift | 2 +- ...SecureBackupLogoutConfirmationScreen.swift | 2 +- .../View/SecureBackupRecoveryKeyScreen.swift | 2 +- .../View/SecureBackupScreen.swift | 4 +-- .../AppLock/AppLockServiceProtocol.swift | 4 +-- .../UITests/UITestsAppCoordinator.swift | 2 +- ...kSetupBiometricsScreenViewModelTests.swift | 4 +-- UnitTests/Sources/AudioPlayerStateTests.swift | 2 +- .../Sources/AudioRecorderStateTests.swift | 2 +- UnitTests/Sources/BugReportServiceTests.swift | 2 +- .../ComposerToolbarViewModelTests.swift | 6 ++--- .../Sources/HomeScreenViewModelTests.swift | 2 +- .../JoinRoomScreenViewModelTests.swift | 2 +- .../LocationSharingScreenViewModelTests.swift | 2 +- .../RoomDetailsScreenViewModelTests.swift | 2 +- .../Sources/RoomScreenViewModelTests.swift | 12 ++++----- ...goutConfirmationScreenViewModelTests.swift | 2 +- .../SpaceAddRoomsScreenViewModelTests.swift | 2 +- .../Sources/TimelineViewModelTests.swift | 4 +-- .../Sources/VoiceMessageRecorderTests.swift | 2 +- 38 files changed, 95 insertions(+), 95 deletions(-) diff --git a/ElementX/Sources/Mocks/AppMediatorMock.swift b/ElementX/Sources/Mocks/AppMediatorMock.swift index 7c615b93a..9f5a19d10 100644 --- a/ElementX/Sources/Mocks/AppMediatorMock.swift +++ b/ElementX/Sources/Mocks/AppMediatorMock.swift @@ -18,13 +18,13 @@ extension AppMediatorMock { convenience init(_ configuration: Configuration) { self.init() - underlyingAppState = configuration.appState - requestAuthorizationIfNeededUnderlyingReturnValue = configuration.isCameraAuthorized - underlyingNetworkMonitor = configuration.networkMonitor + appState = configuration.appState + requestAuthorizationIfNeededReturnValue = configuration.isCameraAuthorized + networkMonitor = configuration.networkMonitor let windowManagerMock = WindowManagerMock() windowManagerMock.closeAllSecondaryWindowsClosure = { } windowManagerMock.closeSecondaryWindowForTypeClosure = { _ in } - underlyingWindowManager = windowManagerMock + windowManager = windowManagerMock } } diff --git a/ElementX/Sources/Mocks/CLLocationManagerMock.swift b/ElementX/Sources/Mocks/CLLocationManagerMock.swift index db611b44f..6abbb6c04 100644 --- a/ElementX/Sources/Mocks/CLLocationManagerMock.swift +++ b/ElementX/Sources/Mocks/CLLocationManagerMock.swift @@ -16,7 +16,7 @@ extension CLLocationManagerMock { convenience init(_ configuration: Configuration) { self.init() - underlyingAuthorizationStatus = configuration.authorizationStatus - underlyingAccuracyAuthorization = configuration.accuracyAuthorization + authorizationStatus = configuration.authorizationStatus + accuracyAuthorization = configuration.accuracyAuthorization } } diff --git a/ElementX/Sources/Mocks/ClientProxyMock.swift b/ElementX/Sources/Mocks/ClientProxyMock.swift index f6668ae52..0436d406f 100644 --- a/ElementX/Sources/Mocks/ClientProxyMock.swift +++ b/ElementX/Sources/Mocks/ClientProxyMock.swift @@ -157,8 +157,8 @@ extension ClientProxyMock { underlyingIsLiveKitRTCSupported = true underlyingIsLoginWithQRCodeSupported = true - underlyingTimelineMediaVisibilityPublisher = CurrentValueSubject(configuration.timelineMediaVisibility).asCurrentValuePublisher() - underlyingHideInviteAvatarsPublisher = CurrentValueSubject(configuration.hideInviteAvatars).asCurrentValuePublisher() + timelineMediaVisibilityPublisher = CurrentValueSubject(configuration.timelineMediaVisibility).asCurrentValuePublisher() + hideInviteAvatarsPublisher = CurrentValueSubject(configuration.hideInviteAvatars).asCurrentValuePublisher() liveLocationOwnInfoUpdatesPublisher = PassthroughSubject().eraseToAnyPublisher() diff --git a/ElementX/Sources/Mocks/ElementCallServiceMock.swift b/ElementX/Sources/Mocks/ElementCallServiceMock.swift index 60d6465d7..8c0d5d16d 100644 --- a/ElementX/Sources/Mocks/ElementCallServiceMock.swift +++ b/ElementX/Sources/Mocks/ElementCallServiceMock.swift @@ -17,7 +17,7 @@ extension ElementCallServiceMock { convenience init(_ configuration: ElementCallServiceMockConfiguration) { self.init() - underlyingActions = PassthroughSubject().eraseToAnyPublisher() - underlyingOngoingCallRoomIDPublisher = .init(.init(configuration.ongoingCallRoomID)) + actions = PassthroughSubject().eraseToAnyPublisher() + ongoingCallRoomIDPublisher = .init(.init(configuration.ongoingCallRoomID)) } } diff --git a/ElementX/Sources/Mocks/JoinedRoomProxyMock.swift b/ElementX/Sources/Mocks/JoinedRoomProxyMock.swift index 50f221a9d..3e349ef1f 100644 --- a/ElementX/Sources/Mocks/JoinedRoomProxyMock.swift +++ b/ElementX/Sources/Mocks/JoinedRoomProxyMock.swift @@ -132,14 +132,14 @@ extension JoinedRoomProxyMock { unbanUserReturnValue = .success(()) let widgetDriver = ElementCallWidgetDriverMock() - widgetDriver.underlyingMessagePublisher = .init() - widgetDriver.underlyingActions = PassthroughSubject().eraseToAnyPublisher() + widgetDriver.messagePublisher = .init() + widgetDriver.actions = PassthroughSubject().eraseToAnyPublisher() guard let url = URL(string: "https://call.element.io/\(UUID().uuidString)#?appPrompt=false") else { fatalError() } - widgetDriver.startBaseURLClientIDColorSchemeVoiceOnlyRageshakeURLAnalyticsConfigurationUnderlyingReturnValue = .success(url) + widgetDriver.startBaseURLClientIDColorSchemeVoiceOnlyRageshakeURLAnalyticsConfigurationReturnValue = .success(url) elementCallWidgetDriverDeviceIDReturnValue = widgetDriver diff --git a/ElementX/Sources/Mocks/LiveLocationManagerMock.swift b/ElementX/Sources/Mocks/LiveLocationManagerMock.swift index 67b2ef71c..f13b55c3b 100644 --- a/ElementX/Sources/Mocks/LiveLocationManagerMock.swift +++ b/ElementX/Sources/Mocks/LiveLocationManagerMock.swift @@ -19,11 +19,11 @@ extension LiveLocationManagerMock { self.init() let authorizationStatusSubject = CurrentValueSubject(configuration.authorizationStatus) - underlyingAuthorizationStatus = .init(authorizationStatusSubject) + authorizationStatus = .init(authorizationStatusSubject) requestAlwaysAuthorizationIfPossibleReturnValue = configuration.requestAlwaysAuthorizationIfPossibleReturnValue startLiveLocationRoomIDDurationReturnValue = .success(()) - underlyingHasDisplayedLiveLocationDisclaimer = configuration.hasDisplayedLiveLocationDisclaimer + hasDisplayedLiveLocationDisclaimer = configuration.hasDisplayedLiveLocationDisclaimer } } diff --git a/ElementX/Sources/Mocks/NSEUserSessionMock.swift b/ElementX/Sources/Mocks/NSEUserSessionMock.swift index 7cf72c943..022167054 100644 --- a/ElementX/Sources/Mocks/NSEUserSessionMock.swift +++ b/ElementX/Sources/Mocks/NSEUserSessionMock.swift @@ -19,6 +19,6 @@ extension NSEUserSessionMock { underlyingInviteAvatarsVisibility = configuration.inviteAvatarsVisibility underlyingMediaPreviewVisibility = configuration.mediaPreviewVisibility - underlyingThreadsEnabled = configuration.threadsEnabled + threadsEnabled = configuration.threadsEnabled } } diff --git a/ElementX/Sources/Mocks/NetworkMonitorMock.swift b/ElementX/Sources/Mocks/NetworkMonitorMock.swift index 19a04a068..9ae558320 100644 --- a/ElementX/Sources/Mocks/NetworkMonitorMock.swift +++ b/ElementX/Sources/Mocks/NetworkMonitorMock.swift @@ -17,6 +17,6 @@ extension NetworkMonitorMock { convenience init(_ configuration: Configuration) { self.init() - underlyingReachabilityPublisher = configuration.reachabilityPublisher + reachabilityPublisher = configuration.reachabilityPublisher } } diff --git a/ElementX/Sources/Mocks/NotificationItemProxyMock.swift b/ElementX/Sources/Mocks/NotificationItemProxyMock.swift index 45a280134..519ed3887 100644 --- a/ElementX/Sources/Mocks/NotificationItemProxyMock.swift +++ b/ElementX/Sources/Mocks/NotificationItemProxyMock.swift @@ -16,7 +16,7 @@ struct NotificationItemProxyMockConfiguration { let messageType = MessageType.text(content: TextMessageContent(body: "Hello world!", formatted: nil)) let messageLikeContent = MessageLikeEventContent.roomMessage(messageType: messageType, inReplyToEventId: nil) let event = TimelineEventSDKMock() - event.eventIdUnderlyingReturnValue = UUID().uuidString + event.eventIdReturnValue = UUID().uuidString event.contentReturnValue = .messageLike(content: messageLikeContent) return .timeline(event: event) }() @@ -40,18 +40,18 @@ extension NotificationItemProxyMock { convenience init(_ configuration: NotificationItemProxyMockConfiguration) { self.init() event = configuration.event - underlyingSenderID = configuration.senderID - underlyingRoomID = configuration.roomID - underlyingReceiverID = configuration.receiverID + senderID = configuration.senderID + roomID = configuration.roomID + receiverID = configuration.receiverID senderDisplayName = configuration.senderDisplayName roomAvatarMediaSource = configuration.roomAvatarMediaSource - underlyingRoomDisplayName = configuration.roomDisplayName - underlyingRoomJoinedMembers = configuration.roomJoinedMembers - underlyingIsRoomDirect = configuration.isRoomDirect - underlyingIsRoomPrivate = configuration.isRoomPrivate - underlyingIsNoisy = configuration.isNoisy - underlyingHasMention = configuration.hasMention + roomDisplayName = configuration.roomDisplayName + roomJoinedMembers = configuration.roomJoinedMembers + isRoomDirect = configuration.isRoomDirect + isRoomPrivate = configuration.isRoomPrivate + isNoisy = configuration.isNoisy + hasMention = configuration.hasMention threadRootEventID = configuration.threadRootEventID - underlyingIsDM = configuration.isRoomDirect && configuration.roomJoinedMembers <= 2 + isDM = configuration.isRoomDirect && configuration.roomJoinedMembers <= 2 } } diff --git a/ElementX/Sources/Mocks/RoomPowerLevelsProxyMock.swift b/ElementX/Sources/Mocks/RoomPowerLevelsProxyMock.swift index 04da567fa..8beabf97a 100644 --- a/ElementX/Sources/Mocks/RoomPowerLevelsProxyMock.swift +++ b/ElementX/Sources/Mocks/RoomPowerLevelsProxyMock.swift @@ -26,7 +26,7 @@ extension RoomPowerLevelsProxyMock { convenience init(_ configuration: Configuration) { self.init() - underlyingValues = RoomPowerLevelsValues.mock + values = RoomPowerLevelsValues.mock canOwnUserSendMessageReturnValue = configuration.canUserSendMessage canOwnUserSendStateEventReturnValue = configuration.canUserSendState diff --git a/ElementX/Sources/Mocks/RoomPreviewProxyMock.swift b/ElementX/Sources/Mocks/RoomPreviewProxyMock.swift index f7b4da61c..c110580a9 100644 --- a/ElementX/Sources/Mocks/RoomPreviewProxyMock.swift +++ b/ElementX/Sources/Mocks/RoomPreviewProxyMock.swift @@ -70,19 +70,19 @@ extension RoomPreviewProxyMock { convenience init(_ configuration: RoomPreviewProxyMock.Configuration) { self.init() - underlyingInfo = .init(roomPreviewInfo: .init(roomId: configuration.roomID, - canonicalAlias: configuration.canonicalAlias, - name: configuration.name, - topic: configuration.topic, - avatarUrl: configuration.avatarURL, - numJoinedMembers: configuration.numJoinedMembers, - numActiveMembers: configuration.numActiveMembers, - roomType: configuration.roomType, - isHistoryWorldReadable: nil, - membership: configuration.membership, - joinRule: configuration.joinRule.rustValue, - isDirect: configuration.isDirect, - heroes: nil)) + info = .init(roomPreviewInfo: .init(roomId: configuration.roomID, + canonicalAlias: configuration.canonicalAlias, + name: configuration.name, + topic: configuration.topic, + avatarUrl: configuration.avatarURL, + numJoinedMembers: configuration.numJoinedMembers, + numActiveMembers: configuration.numActiveMembers, + roomType: configuration.roomType, + isHistoryWorldReadable: nil, + membership: configuration.membership, + joinRule: configuration.joinRule.rustValue, + isDirect: configuration.isDirect, + heroes: nil)) let roomMembershipDetails = RoomMembershipDetailsProxyMock() diff --git a/ElementX/Sources/Mocks/SecureBackupControllerMock.swift b/ElementX/Sources/Mocks/SecureBackupControllerMock.swift index afe0c8f5c..8e89cd067 100644 --- a/ElementX/Sources/Mocks/SecureBackupControllerMock.swift +++ b/ElementX/Sources/Mocks/SecureBackupControllerMock.swift @@ -19,10 +19,10 @@ extension SecureBackupControllerMock { self.init() let recoveryStateSubject = CurrentValueSubject(configuration.recoveryState) - underlyingRecoveryState = .init(recoveryStateSubject) + recoveryState = .init(recoveryStateSubject) let keyBackupStateSubject = CurrentValueSubject(configuration.keyBackupState) - underlyingKeyBackupState = .init(keyBackupStateSubject) + keyBackupState = .init(keyBackupStateSubject) disableClosure = { recoveryStateSubject.send(.disabled) diff --git a/ElementX/Sources/Mocks/SessionVerificationControllerProxyMock.swift b/ElementX/Sources/Mocks/SessionVerificationControllerProxyMock.swift index 8581a7bd3..0a3a4b2f6 100644 --- a/ElementX/Sources/Mocks/SessionVerificationControllerProxyMock.swift +++ b/ElementX/Sources/Mocks/SessionVerificationControllerProxyMock.swift @@ -22,7 +22,7 @@ extension SessionVerificationControllerProxyMock { otherDeviceStartsSasVerification: Bool = false, requestDelay: Duration = .seconds(1)) -> SessionVerificationControllerProxyMock { let mock = SessionVerificationControllerProxyMock() - mock.underlyingActions = actions + mock.actions = actions mock.acknowledgeVerificationRequestDetailsReturnValue = .success(()) diff --git a/ElementX/Sources/Mocks/SignallingTimelineItemProviderMock.swift b/ElementX/Sources/Mocks/SignallingTimelineItemProviderMock.swift index b2ee646d8..c56ce1250 100644 --- a/ElementX/Sources/Mocks/SignallingTimelineItemProviderMock.swift +++ b/ElementX/Sources/Mocks/SignallingTimelineItemProviderMock.swift @@ -34,10 +34,10 @@ class SignallingTimelineItemProviderMock: TimelineItemProviderMock { self.itemProxies = itemProxies - underlyingPaginationState = paginationState - underlyingKind = .live - underlyingUpdatePublisher = stateSubject.eraseToAnyPublisher() - underlyingMembershipChangePublisher = Empty().eraseToAnyPublisher() + self.paginationState = paginationState + kind = .live + updatePublisher = stateSubject.eraseToAnyPublisher() + membershipChangePublisher = Empty().eraseToAnyPublisher() guard listenForSignals else { return } @@ -102,7 +102,7 @@ class SignallingTimelineItemProviderMock: TimelineItemProviderMock { guard !backPaginationResponses.isEmpty else { let newState = TimelinePaginationState(backward: .endReached, forward: .endReached) - underlyingPaginationState = newState + paginationState = newState stateSubject.send((items, newState)) return } @@ -111,7 +111,7 @@ class SignallingTimelineItemProviderMock: TimelineItemProviderMock { let newPaginationState = TimelinePaginationState(backward: backPaginationResponses.isEmpty ? .endReached : .idle, forward: .endReached) itemProxies = newItems + items - underlyingPaginationState = newPaginationState + paginationState = newPaginationState stateSubject.send((newItems + items, newPaginationState)) try client?.send(.success) } diff --git a/ElementX/Sources/Mocks/TimelineControllerMock.swift b/ElementX/Sources/Mocks/TimelineControllerMock.swift index 0e2857b06..c74b1ffd3 100644 --- a/ElementX/Sources/Mocks/TimelineControllerMock.swift +++ b/ElementX/Sources/Mocks/TimelineControllerMock.swift @@ -43,10 +43,10 @@ extension TimelineControllerMock { let timelineProxy = configuration.timelineProxy let timelineItemsTimestamps = configuration.timelineItemsTimestamps - underlyingCallbacks = PassthroughSubject() - underlyingRoomID = roomProxy?.id ?? "MockRoomIdentifier" - underlyingTimelineKind = configuration.timelineKind - underlyingPaginationState = configuration.paginationState + callbacks = PassthroughSubject() + roomID = roomProxy?.id ?? "MockRoomIdentifier" + timelineKind = configuration.timelineKind + paginationState = configuration.paginationState timelineItems = configuration.timelineItems callbacks.send(.paginationState(configuration.paginationState)) diff --git a/ElementX/Sources/Mocks/TimelineProxyMock.swift b/ElementX/Sources/Mocks/TimelineProxyMock.swift index edaaa03aa..8feeb5221 100644 --- a/ElementX/Sources/Mocks/TimelineProxyMock.swift +++ b/ElementX/Sources/Mocks/TimelineProxyMock.swift @@ -32,14 +32,14 @@ extension TimelineProxyMock { editPollOriginalQuestionAnswersPollKindReturnValue = .success(()) if let provider = configuration.timelineItemProvider { - underlyingTimelineItemProvider = provider + timelineItemProvider = provider } else if configuration.isAutoUpdating { - underlyingTimelineItemProvider = AutoUpdatingTimelineItemProviderMock() + timelineItemProvider = AutoUpdatingTimelineItemProviderMock() } else { - let timelineItemProvider = TimelineItemProviderMock() - timelineItemProvider.paginationState = .init(backward: configuration.timelineStartReached ? .endReached : .idle, forward: .endReached) - timelineItemProvider.underlyingMembershipChangePublisher = PassthroughSubject().eraseToAnyPublisher() - underlyingTimelineItemProvider = timelineItemProvider + let provider = TimelineItemProviderMock() + provider.paginationState = .init(backward: configuration.timelineStartReached ? .endReached : .idle, forward: .endReached) + provider.membershipChangePublisher = PassthroughSubject().eraseToAnyPublisher() + timelineItemProvider = provider } } } diff --git a/ElementX/Sources/Mocks/UserIdentityProxyMock.swift b/ElementX/Sources/Mocks/UserIdentityProxyMock.swift index a24b3781a..404a8c70f 100644 --- a/ElementX/Sources/Mocks/UserIdentityProxyMock.swift +++ b/ElementX/Sources/Mocks/UserIdentityProxyMock.swift @@ -14,6 +14,6 @@ extension UserIdentityProxyMock { convenience init(_ configuration: Configuration) { self.init() - underlyingVerificationState = configuration.verificationState + verificationState = configuration.verificationState } } diff --git a/ElementX/Sources/Screens/CallScreen/View/CallScreen.swift b/ElementX/Sources/Screens/CallScreen/View/CallScreen.swift index 735bd20de..d08fe989a 100644 --- a/ElementX/Sources/Screens/CallScreen/View/CallScreen.swift +++ b/ElementX/Sources/Screens/CallScreen/View/CallScreen.swift @@ -358,8 +358,8 @@ struct CallScreen_Previews: PreviewProvider { let roomProxy = JoinedRoomProxyMock() let widgetDriver = ElementCallWidgetDriverMock() - widgetDriver.underlyingMessagePublisher = .init() - widgetDriver.underlyingActions = PassthroughSubject().eraseToAnyPublisher() + widgetDriver.messagePublisher = .init() + widgetDriver.actions = PassthroughSubject().eraseToAnyPublisher() widgetDriver.startBaseURLClientIDColorSchemeVoiceOnlyRageshakeURLAnalyticsConfigurationReturnValue = .success(URL.userDirectory) roomProxy.elementCallWidgetDriverDeviceIDReturnValue = widgetDriver diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift index 94b417cc5..9105cc2f2 100644 --- a/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift +++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift @@ -98,7 +98,7 @@ struct SecureBackupKeyBackupScreen_Previews: PreviewProvider, TestablePreview { static func viewModel(keyBackupState: SecureBackupKeyBackupState) -> SecureBackupKeyBackupScreenViewModelType { let backupController = SecureBackupControllerMock() - backupController.underlyingKeyBackupState = CurrentValueSubject(keyBackupState).asCurrentValuePublisher() + backupController.keyBackupState = CurrentValueSubject(keyBackupState).asCurrentValuePublisher() return SecureBackupKeyBackupScreenViewModel(secureBackupController: backupController, userIndicatorController: nil) diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/View/SecureBackupLogoutConfirmationScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/View/SecureBackupLogoutConfirmationScreen.swift index 394112f6d..f8464233a 100644 --- a/ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/View/SecureBackupLogoutConfirmationScreen.swift +++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupLogoutConfirmationScreen/View/SecureBackupLogoutConfirmationScreen.swift @@ -150,7 +150,7 @@ struct SecureBackupLogoutConfirmationScreen_Previews: PreviewProvider, TestableP static func makeViewModel(mode: SecureBackupLogoutConfirmationScreenViewMode) -> SecureBackupLogoutConfirmationScreenViewModel { let secureBackupController = SecureBackupControllerMock() - secureBackupController.underlyingKeyBackupState = CurrentValueSubject(.enabled).asCurrentValuePublisher() + secureBackupController.keyBackupState = CurrentValueSubject(.enabled).asCurrentValuePublisher() secureBackupController.waitForKeyBackupUploadUploadStateSubjectClosure = { uploadStateSubject in if case .backupOngoing = mode { diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift index 67d229f69..d2f4c388d 100644 --- a/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift +++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift @@ -275,7 +275,7 @@ struct SecureBackupRecoveryKeyScreen_Previews: PreviewProvider, TestablePreview static func viewModel(recoveryState: SecureBackupRecoveryState, generateKey: Bool = false, key: String? = nil) -> SecureBackupRecoveryKeyScreenViewModelType { let backupController = SecureBackupControllerMock() - backupController.underlyingRecoveryState = CurrentValueSubject(recoveryState).asCurrentValuePublisher() + backupController.recoveryState = CurrentValueSubject(recoveryState).asCurrentValuePublisher() if let key { backupController.generateRecoveryKeyReturnValue = .success(key) diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupScreen/View/SecureBackupScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupScreen/View/SecureBackupScreen.swift index 1d1a61b2d..a5d5b04a1 100644 --- a/ElementX/Sources/Screens/SecureBackup/SecureBackupScreen/View/SecureBackupScreen.swift +++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupScreen/View/SecureBackupScreen.swift @@ -151,8 +151,8 @@ struct SecureBackupScreen_Previews: PreviewProvider, TestablePreview { static func viewModel(keyBackupState: SecureBackupKeyBackupState, recoveryState: SecureBackupRecoveryState) -> SecureBackupScreenViewModelType { let backupController = SecureBackupControllerMock() - backupController.underlyingKeyBackupState = CurrentValueSubject(keyBackupState).asCurrentValuePublisher() - backupController.underlyingRecoveryState = CurrentValueSubject(recoveryState).asCurrentValuePublisher() + backupController.keyBackupState = CurrentValueSubject(keyBackupState).asCurrentValuePublisher() + backupController.recoveryState = CurrentValueSubject(recoveryState).asCurrentValuePublisher() return SecureBackupScreenViewModel(secureBackupController: backupController, userIndicatorController: UserIndicatorControllerMock(), diff --git a/ElementX/Sources/Services/AppLock/AppLockServiceProtocol.swift b/ElementX/Sources/Services/AppLock/AppLockServiceProtocol.swift index ecb3407f3..818daaac5 100644 --- a/ElementX/Sources/Services/AppLock/AppLockServiceProtocol.swift +++ b/ElementX/Sources/Services/AppLock/AppLockServiceProtocol.swift @@ -88,8 +88,8 @@ extension AppLockServiceMock { mock.isEnabled = pinCode != nil mock.isMandatory = isMandatory mock.numberOfPINAttempts = CurrentValueSubject(numberOfPINAttempts).eraseToAnyPublisher() - mock.underlyingBiometryType = biometryType - mock.underlyingBiometricUnlockEnabled = biometryType != .none + mock.biometryType = biometryType + mock.biometricUnlockEnabled = biometryType != .none mock.unlockWithClosure = { $0 == pinCode } return mock } diff --git a/ElementX/Sources/UITests/UITestsAppCoordinator.swift b/ElementX/Sources/UITests/UITestsAppCoordinator.swift index 975ffa9fb..019825e58 100644 --- a/ElementX/Sources/UITests/UITestsAppCoordinator.swift +++ b/ElementX/Sources/UITests/UITestsAppCoordinator.swift @@ -632,7 +632,7 @@ class MockScreen: Identifiable { clientProxy.spaceService = spaceServiceProxy let appMediator = AppMediatorMock(.init()) - appMediator.underlyingWindowManager = windowManager + appMediator.windowManager = windowManager let itemProvider = SignallingTimelineItemProviderMock(itemProxies: RoomTimelineItemFixtures.largeChunkProxies) diff --git a/UnitTests/Sources/AppLock/AppLockSetupBiometricsScreenViewModelTests.swift b/UnitTests/Sources/AppLock/AppLockSetupBiometricsScreenViewModelTests.swift index 649277ca6..21ec067fa 100644 --- a/UnitTests/Sources/AppLock/AppLockSetupBiometricsScreenViewModelTests.swift +++ b/UnitTests/Sources/AppLock/AppLockSetupBiometricsScreenViewModelTests.swift @@ -20,8 +20,8 @@ final class AppLockSetupBiometricsScreenViewModelTests { init() { appLockService = AppLockServiceMock() - appLockService.underlyingIsEnabled = true - appLockService.underlyingBiometryType = .touchID + appLockService.isEnabled = true + appLockService.biometryType = .touchID appLockService.enableBiometricUnlockReturnValue = .success(()) viewModel = AppLockSetupBiometricsScreenViewModel(appLockService: appLockService) } diff --git a/UnitTests/Sources/AudioPlayerStateTests.swift b/UnitTests/Sources/AudioPlayerStateTests.swift index 7fc75a2fd..c65190728 100644 --- a/UnitTests/Sources/AudioPlayerStateTests.swift +++ b/UnitTests/Sources/AudioPlayerStateTests.swift @@ -26,7 +26,7 @@ struct AudioPlayerStateTests { private func buildAudioPlayerMock() -> AudioPlayerMock { let audioPlayerMock = AudioPlayerMock() - audioPlayerMock.underlyingActions = audioPlayerActions + audioPlayerMock.actions = audioPlayerActions audioPlayerMock.state = .stopped audioPlayerMock.currentTime = 0.0 audioPlayerMock.duration = 0.0 diff --git a/UnitTests/Sources/AudioRecorderStateTests.swift b/UnitTests/Sources/AudioRecorderStateTests.swift index 4f83050d4..c75e67ad8 100644 --- a/UnitTests/Sources/AudioRecorderStateTests.swift +++ b/UnitTests/Sources/AudioRecorderStateTests.swift @@ -24,7 +24,7 @@ struct AudioRecorderStateTests { private func buildAudioRecorderMock() -> AudioRecorderMock { let audioRecorderMock = AudioRecorderMock() audioRecorderMock.isRecording = false - audioRecorderMock.underlyingActions = audioRecorderActions + audioRecorderMock.actions = audioRecorderActions audioRecorderMock.currentTime = 0.0 audioRecorderMock.averagePowerReturnValue = 0 return audioRecorderMock diff --git a/UnitTests/Sources/BugReportServiceTests.swift b/UnitTests/Sources/BugReportServiceTests.swift index 07cee1365..e8a54728d 100644 --- a/UnitTests/Sources/BugReportServiceTests.swift +++ b/UnitTests/Sources/BugReportServiceTests.swift @@ -20,7 +20,7 @@ final class BugReportServiceTests { appSettings.bugReportRageshakeURL.reset() let bugReportServiceMock = BugReportServiceMock() - bugReportServiceMock.underlyingCrashedLastRun = false + bugReportServiceMock.crashedLastRun = false bugReportServiceMock.submitBugReportProgressListenerReturnValue = .success(SubmitBugReportResponse(reportURL: "https://www.example.com/123")) bugReportService = bugReportServiceMock } diff --git a/UnitTests/Sources/ComposerToolbarViewModelTests.swift b/UnitTests/Sources/ComposerToolbarViewModelTests.swift index b8961ec62..056d1ae72 100644 --- a/UnitTests/Sources/ComposerToolbarViewModelTests.swift +++ b/UnitTests/Sources/ComposerToolbarViewModelTests.swift @@ -700,7 +700,7 @@ final class ComposerToolbarViewModelTests { } let mockSubject = CurrentValueSubject<[IdentityStatusChange], Never>([]) - roomProxyMock.underlyingIdentityStatusChangesPublisher = mockSubject.asCurrentValuePublisher() + roomProxyMock.identityStatusChangesPublisher = mockSubject.asCurrentValuePublisher() let appSettings = AppSettings.volatile() @@ -747,7 +747,7 @@ final class ComposerToolbarViewModelTests { IdentityStatusChange(userId: "@bob:localhost", changedTo: .verificationViolation) ]) - roomProxyMock.underlyingIdentityStatusChangesPublisher = mockSubject.asCurrentValuePublisher() + roomProxyMock.identityStatusChangesPublisher = mockSubject.asCurrentValuePublisher() let appSettings = AppSettings.volatile() @@ -784,7 +784,7 @@ final class ComposerToolbarViewModelTests { .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() viewModel = ComposerToolbarViewModel(roomProxy: roomProxyMock, diff --git a/UnitTests/Sources/HomeScreenViewModelTests.swift b/UnitTests/Sources/HomeScreenViewModelTests.swift index 60a72ef10..f5abd111e 100644 --- a/UnitTests/Sources/HomeScreenViewModelTests.swift +++ b/UnitTests/Sources/HomeScreenViewModelTests.swift @@ -420,7 +420,7 @@ final class HomeScreenViewModelTests { spaceServiceProxy.spaceRoomListSpaceIDClosure = { spaceID in .success(SpaceRoomListProxyMock(.init(spaceServiceRoom: SpaceServiceRoom.mock(id: spaceID, isSpace: true)))) } - clientProxy.underlyingSpaceService = spaceServiceProxy + clientProxy.spaceService = spaceServiceProxy case nil: break } diff --git a/UnitTests/Sources/JoinRoomScreenViewModelTests.swift b/UnitTests/Sources/JoinRoomScreenViewModelTests.swift index 150384ac1..ed3b61251 100644 --- a/UnitTests/Sources/JoinRoomScreenViewModelTests.swift +++ b/UnitTests/Sources/JoinRoomScreenViewModelTests.swift @@ -179,7 +179,7 @@ final class JoinRoomScreenViewModelTests { clientProxy.roomForIdentifierClosure = { _ in let roomProxy = KnockedRoomProxyMock(.init()) // to test the cancel knock function - roomProxy.cancelKnockUnderlyingReturnValue = .success(()) + roomProxy.cancelKnockReturnValue = .success(()) return .knocked(roomProxy) } case .joined: diff --git a/UnitTests/Sources/LocationSharingScreenViewModelTests.swift b/UnitTests/Sources/LocationSharingScreenViewModelTests.swift index d8d8f4d88..0c32482e1 100644 --- a/UnitTests/Sources/LocationSharingScreenViewModelTests.swift +++ b/UnitTests/Sources/LocationSharingScreenViewModelTests.swift @@ -219,7 +219,7 @@ struct LocationSharingScreenViewModelTests { mutating func startLiveLocationWithNotDeterminedAuthorizationTransitionsToWhenInUse() async { let authorizationStatusSubject = CurrentValueSubject(.notDetermined) let liveLocationManagerMock = LiveLocationManagerMock() - liveLocationManagerMock.underlyingAuthorizationStatus = .init(authorizationStatusSubject) + liveLocationManagerMock.authorizationStatus = .init(authorizationStatusSubject) liveLocationManagerMock.requestAlwaysAuthorizationIfPossibleReturnValue = true setupViewModel(liveLocationManagerMock: liveLocationManagerMock) diff --git a/UnitTests/Sources/RoomDetailsScreenViewModelTests.swift b/UnitTests/Sources/RoomDetailsScreenViewModelTests.swift index b12788c49..1dfd4fb58 100644 --- a/UnitTests/Sources/RoomDetailsScreenViewModelTests.swift +++ b/UnitTests/Sources/RoomDetailsScreenViewModelTests.swift @@ -790,7 +790,7 @@ struct RoomDetailsScreenViewModelTests { let configuration = JoinedRoomProxyMockConfiguration(historyVisibility: .shared) let infoSubject = CurrentValueSubject(RoomInfoProxyMock(configuration)) let roomProxyMock = JoinedRoomProxyMock(configuration) - roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() + roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher() viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock, userSession: UserSessionMock(.init()), diff --git a/UnitTests/Sources/RoomScreenViewModelTests.swift b/UnitTests/Sources/RoomScreenViewModelTests.swift index f3e0b513b..d6dd7454c 100644 --- a/UnitTests/Sources/RoomScreenViewModelTests.swift +++ b/UnitTests/Sources/RoomScreenViewModelTests.swift @@ -38,7 +38,7 @@ final class RoomScreenViewModelTests { return .success(timeline) } // setup the room proxy actions publisher - roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() + roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher() let viewModel = RoomScreenViewModel(userSession: UserSessionMock(.init()), roomProxy: roomProxyMock, initialSelectedPinnedEventID: nil, @@ -72,7 +72,7 @@ final class RoomScreenViewModelTests { let pinnedTimelineMock = TimelineProxyMock() let pinnedTimelineItemProviderMock = TimelineItemProviderMock() let providerUpdateSubject = PassthroughSubject<([TimelineItemProxy], TimelinePaginationState), Never>() - pinnedTimelineItemProviderMock.underlyingUpdatePublisher = providerUpdateSubject.eraseToAnyPublisher() + pinnedTimelineItemProviderMock.updatePublisher = providerUpdateSubject.eraseToAnyPublisher() pinnedTimelineMock.timelineItemProvider = pinnedTimelineItemProviderMock pinnedTimelineItemProviderMock.itemProxies = [.event(.init(item: EventTimelineItem(configuration: .init(eventID: "test1")), uniqueID: .init("1"))), .event(.init(item: EventTimelineItem(configuration: .init(eventID: "test2")), uniqueID: .init("2")))] @@ -115,7 +115,7 @@ final class RoomScreenViewModelTests { let pinnedTimelineMock = TimelineProxyMock() let pinnedTimelineItemProviderMock = TimelineItemProviderMock() 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"))), .event(.init(item: EventTimelineItem(configuration: .init(eventID: "test2")), uniqueID: .init("2"))), .event(.init(item: EventTimelineItem(configuration: .init(eventID: "test3")), uniqueID: .init("3")))] @@ -175,7 +175,7 @@ final class RoomScreenViewModelTests { let pinnedTimelineMock = TimelineProxyMock() let pinnedTimelineItemProviderMock = TimelineItemProviderMock() 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"))), .event(.init(item: EventTimelineItem(configuration: .init(eventID: "test2")), uniqueID: .init("2"))), .event(.init(item: EventTimelineItem(configuration: .init(eventID: "test3")), uniqueID: .init("3")))] @@ -238,7 +238,7 @@ final class RoomScreenViewModelTests { roomInfoProxyMock.powerLevels = powerLevelsMock let infoSubject = CurrentValueSubject(roomInfoProxyMock) - roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() + roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher() let viewModel = RoomScreenViewModel(userSession: UserSessionMock(.init()), roomProxy: roomProxyMock, @@ -452,7 +452,7 @@ final class RoomScreenViewModelTests { let roomProxyMock = JoinedRoomProxyMock(configuration) // setup the room proxy actions publisher - roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() + roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher() let viewModel = RoomScreenViewModel(userSession: UserSessionMock(.init()), roomProxy: roomProxyMock, initialSelectedPinnedEventID: nil, diff --git a/UnitTests/Sources/SecureBackupLogoutConfirmationScreenViewModelTests.swift b/UnitTests/Sources/SecureBackupLogoutConfirmationScreenViewModelTests.swift index 064da6f0c..7284e2b16 100644 --- a/UnitTests/Sources/SecureBackupLogoutConfirmationScreenViewModelTests.swift +++ b/UnitTests/Sources/SecureBackupLogoutConfirmationScreenViewModelTests.swift @@ -22,7 +22,7 @@ struct SecureBackupLogoutConfirmationScreenViewModelTests { init() { secureBackupController = SecureBackupControllerMock() - secureBackupController.underlyingKeyBackupState = CurrentValueSubject(.enabled).asCurrentValuePublisher() + secureBackupController.keyBackupState = CurrentValueSubject(.enabled).asCurrentValuePublisher() reachabilitySubject = CurrentValueSubject(.reachable) diff --git a/UnitTests/Sources/SpaceAddRoomsScreenViewModelTests.swift b/UnitTests/Sources/SpaceAddRoomsScreenViewModelTests.swift index e995f6a09..199d9dc43 100644 --- a/UnitTests/Sources/SpaceAddRoomsScreenViewModelTests.swift +++ b/UnitTests/Sources/SpaceAddRoomsScreenViewModelTests.swift @@ -26,7 +26,7 @@ struct SpaceAddRoomsScreenViewModelTests { let clientProxy = ClientProxyMock(.init()) 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, userSession: UserSessionMock(.init(clientProxy: clientProxy)), diff --git a/UnitTests/Sources/TimelineViewModelTests.swift b/UnitTests/Sources/TimelineViewModelTests.swift index 8b6c11bfd..0081041f6 100644 --- a/UnitTests/Sources/TimelineViewModelTests.swift +++ b/UnitTests/Sources/TimelineViewModelTests.swift @@ -472,7 +472,7 @@ final class TimelineViewModelTests { pinnedEventIDs: .init(["test1"])) let roomProxyMock = JoinedRoomProxyMock(configuration) let infoSubject = CurrentValueSubject(RoomInfoProxyMock(configuration)) - roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() + roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher() let viewModel = TimelineViewModel(roomProxy: roomProxyMock, timelineController: TimelineControllerMock(.init()), @@ -503,7 +503,7 @@ final class TimelineViewModelTests { powerLevelsConfiguration: .init(canUserPin: true)) let roomProxyMock = JoinedRoomProxyMock(configuration) let infoSubject = CurrentValueSubject(RoomInfoProxyMock(configuration)) - roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher() + roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher() let viewModel = TimelineViewModel(roomProxy: roomProxyMock, timelineController: TimelineControllerMock(.init()), diff --git a/UnitTests/Sources/VoiceMessageRecorderTests.swift b/UnitTests/Sources/VoiceMessageRecorderTests.swift index 97c26a3bc..50c7d7d4e 100644 --- a/UnitTests/Sources/VoiceMessageRecorderTests.swift +++ b/UnitTests/Sources/VoiceMessageRecorderTests.swift @@ -35,7 +35,7 @@ struct VoiceMessageRecorderTests { init() async throws { audioRecorder = AudioRecorderMock() - audioRecorder.underlyingCurrentTime = 0 + audioRecorder.currentTime = 0 audioRecorder.averagePowerReturnValue = 0 audioRecorder.actions = audioRecorderActions