ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-10-31 16:24:11 +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
UnitTests/Sources/AppLock/AppLockSetupBiometricsScreenViewModelTests.swift
+2 -2
View File
@@ -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)
}
UnitTests/Sources/AudioPlayerStateTests.swift
+1 -1
View File
@@ -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
UnitTests/Sources/AudioRecorderStateTests.swift
+1 -1
View File
@@ -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
UnitTests/Sources/BugReportServiceTests.swift
+1 -1
View File
@@ -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
}
UnitTests/Sources/ComposerToolbarViewModelTests.swift
+3 -3
View File
@@ -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,
UnitTests/Sources/HomeScreenViewModelTests.swift
+1 -1
View File
@@ -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
}
UnitTests/Sources/JoinRoomScreenViewModelTests.swift
+1 -1
View File
@@ -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:
UnitTests/Sources/LocationSharingScreenViewModelTests.swift
+1 -1
View File
@@ -219,7 +219,7 @@ struct LocationSharingScreenViewModelTests {
mutating func startLiveLocationWithNotDeterminedAuthorizationTransitionsToWhenInUse() async {
let authorizationStatusSubject = CurrentValueSubject<CLAuthorizationStatus, Never>(.notDetermined)
let liveLocationManagerMock = LiveLocationManagerMock()
liveLocationManagerMock.underlyingAuthorizationStatus = .init(authorizationStatusSubject)
liveLocationManagerMock.authorizationStatus = .init(authorizationStatusSubject)
liveLocationManagerMock.requestAlwaysAuthorizationIfPossibleReturnValue = true
setupViewModel(liveLocationManagerMock: liveLocationManagerMock)
UnitTests/Sources/RoomDetailsScreenViewModelTests.swift
+1 -1
View File
@@ -790,7 +790,7 @@ struct RoomDetailsScreenViewModelTests {
let configuration = JoinedRoomProxyMockConfiguration(historyVisibility: .shared)
let infoSubject = CurrentValueSubject<RoomInfoProxyProtocol, Never>(RoomInfoProxyMock(configuration))
let roomProxyMock = JoinedRoomProxyMock(configuration)
roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher()
roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher()
viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
userSession: UserSessionMock(.init()),
UnitTests/Sources/RoomScreenViewModelTests.swift
+6 -6
View File
@@ -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<RoomInfoProxyProtocol, Never>(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,
UnitTests/Sources/SecureBackupLogoutConfirmationScreenViewModelTests.swift
+1 -1
View File
@@ -22,7 +22,7 @@ struct SecureBackupLogoutConfirmationScreenViewModelTests {
init() {
secureBackupController = SecureBackupControllerMock()
secureBackupController.underlyingKeyBackupState = CurrentValueSubject<SecureBackupKeyBackupState, Never>(.enabled).asCurrentValuePublisher()
secureBackupController.keyBackupState = CurrentValueSubject<SecureBackupKeyBackupState, Never>(.enabled).asCurrentValuePublisher()
reachabilitySubject = CurrentValueSubject<NetworkMonitorReachability, Never>(.reachable)
UnitTests/Sources/SpaceAddRoomsScreenViewModelTests.swift
+1 -1
View File
@@ -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)),
UnitTests/Sources/TimelineViewModelTests.swift
+2 -2
View File
@@ -472,7 +472,7 @@ final class TimelineViewModelTests {
pinnedEventIDs: .init(["test1"]))
let roomProxyMock = JoinedRoomProxyMock(configuration)
let infoSubject = CurrentValueSubject<RoomInfoProxyProtocol, Never>(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<RoomInfoProxyProtocol, Never>(RoomInfoProxyMock(configuration))
roomProxyMock.underlyingInfoPublisher = infoSubject.asCurrentValuePublisher()
roomProxyMock.infoPublisher = infoSubject.asCurrentValuePublisher()
let viewModel = TimelineViewModel(roomProxy: roomProxyMock,
timelineController: TimelineControllerMock(.init()),
UnitTests/Sources/VoiceMessageRecorderTests.swift
+1 -1
View File
@@ -35,7 +35,7 @@ struct VoiceMessageRecorderTests {
init() async throws {
audioRecorder = AudioRecorderMock()
audioRecorder.underlyingCurrentTime = 0
audioRecorder.currentTime = 0
audioRecorder.averagePowerReturnValue = 0
audioRecorder.actions = audioRecorderActions