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

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) {
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
}
}
ElementX/Sources/Mocks/CLLocationManagerMock.swift
+2 -2
View File
@@ -16,7 +16,7 @@ extension CLLocationManagerMock {
convenience init(_ configuration: Configuration) {
self.init()
underlyingAuthorizationStatus = configuration.authorizationStatus
underlyingAccuracyAuthorization = configuration.accuracyAuthorization
authorizationStatus = configuration.authorizationStatus
accuracyAuthorization = configuration.accuracyAuthorization
}
}
ElementX/Sources/Mocks/ClientProxyMock.swift
+2 -2
View File
@@ -157,8 +157,8 @@ extension ClientProxyMock {
underlyingIsLiveKitRTCSupported = true
underlyingIsLoginWithQRCodeSupported = true
underlyingTimelineMediaVisibilityPublisher = CurrentValueSubject<TimelineMediaVisibility, Never>(configuration.timelineMediaVisibility).asCurrentValuePublisher()
underlyingHideInviteAvatarsPublisher = CurrentValueSubject<Bool, Never>(configuration.hideInviteAvatars).asCurrentValuePublisher()
timelineMediaVisibilityPublisher = CurrentValueSubject<TimelineMediaVisibility, Never>(configuration.timelineMediaVisibility).asCurrentValuePublisher()
hideInviteAvatarsPublisher = CurrentValueSubject<Bool, Never>(configuration.hideInviteAvatars).asCurrentValuePublisher()
liveLocationOwnInfoUpdatesPublisher = PassthroughSubject<LiveLocationOwnInfoUpdate, Never>().eraseToAnyPublisher()
ElementX/Sources/Mocks/ElementCallServiceMock.swift
+2 -2
View File
@@ -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))
}
}
ElementX/Sources/Mocks/JoinedRoomProxyMock.swift
+3 -3
View File
@@ -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
ElementX/Sources/Mocks/LiveLocationManagerMock.swift
+2 -2
View File
@@ -19,11 +19,11 @@ extension LiveLocationManagerMock {
self.init()
let authorizationStatusSubject = CurrentValueSubject<CLAuthorizationStatus, Never>(configuration.authorizationStatus)
underlyingAuthorizationStatus = .init(authorizationStatusSubject)
authorizationStatus = .init(authorizationStatusSubject)
requestAlwaysAuthorizationIfPossibleReturnValue = configuration.requestAlwaysAuthorizationIfPossibleReturnValue
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
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) {
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 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
}
}
ElementX/Sources/Mocks/RoomPowerLevelsProxyMock.swift
+1 -1
View File
@@ -26,7 +26,7 @@ extension RoomPowerLevelsProxyMock {
convenience init(_ configuration: Configuration) {
self.init()
underlyingValues = RoomPowerLevelsValues.mock
values = RoomPowerLevelsValues.mock
canOwnUserSendMessageReturnValue = configuration.canUserSendMessage
canOwnUserSendStateEventReturnValue = configuration.canUserSendState
ElementX/Sources/Mocks/RoomPreviewProxyMock.swift
+13 -13
View File
@@ -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()
ElementX/Sources/Mocks/SecureBackupControllerMock.swift
+2 -2
View File
@@ -19,10 +19,10 @@ extension SecureBackupControllerMock {
self.init()
let recoveryStateSubject = CurrentValueSubject<SecureBackupRecoveryState, Never>(configuration.recoveryState)
underlyingRecoveryState = .init(recoveryStateSubject)
recoveryState = .init(recoveryStateSubject)
let keyBackupStateSubject = CurrentValueSubject<SecureBackupKeyBackupState, Never>(configuration.keyBackupState)
underlyingKeyBackupState = .init(keyBackupStateSubject)
keyBackupState = .init(keyBackupStateSubject)
disableClosure = {
recoveryStateSubject.send(.disabled)
ElementX/Sources/Mocks/SessionVerificationControllerProxyMock.swift
+1 -1
View File
@@ -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(())
ElementX/Sources/Mocks/SignallingTimelineItemProviderMock.swift
+6 -6
View File
@@ -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)
}
ElementX/Sources/Mocks/TimelineControllerMock.swift
+4 -4
View File
@@ -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))
ElementX/Sources/Mocks/TimelineProxyMock.swift
+6 -6
View File
@@ -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
}
}
}
ElementX/Sources/Mocks/UserIdentityProxyMock.swift
+1 -1
View File
@@ -14,6 +14,6 @@ extension UserIdentityProxyMock {
convenience init(_ configuration: Configuration) {
self.init()
underlyingVerificationState = configuration.verificationState
verificationState = configuration.verificationState
}
}