Tidy up mock creation. (#5627)

* Use our standard XYZMock(.init()) pattern everywhere instead of XYZMock.default.

* Remove the configuration parameter label on mock convenience inits.

* Update the enterprise submodule.

UnitTests/Sources/AuthenticationServiceTests.swift

@@ -136,13 +136,13 @@ struct AuthenticationServiceTests {
                                 classicAppAccounts: [ClassicAppAccount] = [],
                                 availableSecrets: ClassicAppAccount.AvailableSecrets = .complete) async throws {
         let configuration: AuthenticationClientFactoryMock.Configuration = .init()
-        let clientFactory = AuthenticationClientFactoryMock(configuration: configuration)
+        let clientFactory = AuthenticationClientFactoryMock(configuration)
         
         client = configuration.homeserverClients[serverAddress]
         encryption = EncryptionSDKMock()
         client.encryptionReturnValue = encryption
         
-        userSessionStore = UserSessionStoreMock(configuration: .init())
+        userSessionStore = UserSessionStoreMock(.init())
         encryptionKeyProvider = MockEncryptionKeyProvider()
         
         let classicAppManager = ClassicAppManagerMock(.init(accounts: classicAppAccounts,

UnitTests/Sources/AuthenticationStartScreenViewModelTests.swift

@@ -279,9 +279,9 @@ final class AuthenticationStartScreenViewModelTests {
                                 supportsPasswordLogin: Bool = true,
                                 availableSecrets: ClassicAppAccount.AvailableSecrets = .complete) async {
         // Manually create a configuration as the default homeserver address setting is immutable.
-        client = ClientSDKMock(configuration: .init(oAuthLoginURL: supportsOAuth ? "https://account.company.com/authorize" : nil,
-                                                    supportsOAuthCreatePrompt: false,
-                                                    supportsPasswordLogin: supportsPasswordLogin))
+        client = ClientSDKMock(.init(oAuthLoginURL: supportsOAuth ? "https://account.company.com/authorize" : nil,
+                                     supportsOAuthCreatePrompt: false,
+                                     supportsPasswordLogin: supportsPasswordLogin))
         // Map both the server name and the homeserver URL so fallback lookups work.
         let homeserverClients: [String: ClientSDKMock] = ["company.com": client,
                                                           "https://matrix.company.com": client]
@@ -295,8 +295,8 @@ final class AuthenticationStartScreenViewModelTests {
         
         notificationCenter = NotificationCenter()
         
-        clientFactory = AuthenticationClientFactoryMock(configuration: configuration)
-        authenticationService = AuthenticationService(userSessionStore: UserSessionStoreMock(configuration: .init()),
+        clientFactory = AuthenticationClientFactoryMock(configuration)
+        authenticationService = AuthenticationService(userSessionStore: UserSessionStoreMock(.init()),
                                                       encryptionKeyProvider: EncryptionKeyProvider(),
                                                       classicAppManager: classicAppManager,
                                                       clientFactory: clientFactory,
@@ -310,7 +310,7 @@ final class AuthenticationStartScreenViewModelTests {
                                                        isBugReportServiceEnabled: true,
                                                        appMediator: AppMediatorMock(),
                                                        appSettings: appSettings,
-                                                       mediaProvider: MediaProviderMock(configuration: .init()),
+                                                       mediaProvider: MediaProviderMock(.init()),
                                                        notificationCenter: notificationCenter,
                                                        userIndicatorController: UserIndicatorControllerMock())
         

UnitTests/Sources/BlockedUsersScreenViewModelTests.swift

@@ -19,7 +19,7 @@ struct BlockedUsersScreenViewModelTests {
         
         let viewModel = BlockedUsersScreenViewModel(hideProfiles: true,
                                                     userSession: UserSessionMock(.init(clientProxy: clientProxy)),
-                                                    userIndicatorController: UserIndicatorControllerMock.default)
+                                                    userIndicatorController: UserIndicatorControllerMock())
         
         let deferred = deferFailure(viewModel.context.observe(\.viewState.blockedUsers), timeout: .seconds(1)) { $0.contains { $0.displayName != nil } }
         try await deferred.fulfill()
@@ -34,7 +34,7 @@ struct BlockedUsersScreenViewModelTests {
         
         let viewModel = BlockedUsersScreenViewModel(hideProfiles: false,
                                                     userSession: UserSessionMock(.init(clientProxy: clientProxy)),
-                                                    userIndicatorController: UserIndicatorControllerMock.default)
+                                                    userIndicatorController: UserIndicatorControllerMock())
         
         let deferred = deferFulfillment(viewModel.context.observe(\.viewState.blockedUsers)) { $0.contains { $0.displayName != nil } }
         try await deferred.fulfill()

UnitTests/Sources/ChatsTabFlowCoordinatorTests.swift

@@ -46,10 +46,10 @@ struct ChatsTabFlowCoordinatorTests {
                                                   timelineControllerFactory: timelineControllerFactory,
                                                   emojiProvider: EmojiProvider(appSettings: appSettings),
                                                   linkMetadataProvider: LinkMetadataProvider(),
-                                                  appMediator: AppMediatorMock.default,
+                                                  appMediator: AppMediatorMock(.init()),
                                                   appSettings: appSettings,
                                                   appHooks: AppHooks(),
-                                                  analytics: AnalyticsServiceMock.default,
+                                                  analytics: AnalyticsServiceMock(.init()),
                                                   userIndicatorController: UserIndicatorControllerMock(),
                                                   notificationManager: notificationManager,
                                                   stateMachineFactory: stateMachineFactory)

UnitTests/Sources/ComposerToolbarViewModelTests.swift

@@ -88,10 +88,10 @@ final class ComposerToolbarViewModelTests {
         viewModel = ComposerToolbarViewModel(roomProxy: JoinedRoomProxyMock(.init()),
                                              wysiwygViewModel: wysiwygViewModel,
                                              completionSuggestionService: mockCompletionSuggestionService,
-                                             mediaProvider: MediaProviderMock(configuration: .init()),
+                                             mediaProvider: MediaProviderMock(.init()),
                                              mentionDisplayHelper: ComposerMentionDisplayHelper.mock,
                                              appSettings: appSettings,
-                                             analyticsService: AnalyticsServiceMock.default,
+                                             analyticsService: AnalyticsServiceMock(.init()),
                                              composerDraftService: draftServiceMock)
         
         #expect(viewModel.state.suggestions == suggestions)
@@ -707,10 +707,10 @@ final class ComposerToolbarViewModelTests {
         viewModel = ComposerToolbarViewModel(roomProxy: roomProxyMock,
                                              wysiwygViewModel: wysiwygViewModel,
                                              completionSuggestionService: mockCompletionSuggestionService,
-                                             mediaProvider: MediaProviderMock(configuration: .init()),
+                                             mediaProvider: MediaProviderMock(.init()),
                                              mentionDisplayHelper: ComposerMentionDisplayHelper.mock,
                                              appSettings: appSettings,
-                                             analyticsService: AnalyticsServiceMock.default,
+                                             analyticsService: AnalyticsServiceMock(.init()),
                                              composerDraftService: draftServiceMock)
         
         var fulfillment = deferFulfillment(viewModel.context.$viewState, message: "Composer is disabled") { $0.canSend == false }
@@ -754,10 +754,10 @@ final class ComposerToolbarViewModelTests {
         viewModel = ComposerToolbarViewModel(roomProxy: roomProxyMock,
                                              wysiwygViewModel: wysiwygViewModel,
                                              completionSuggestionService: mockCompletionSuggestionService,
-                                             mediaProvider: MediaProviderMock(configuration: .init()),
+                                             mediaProvider: MediaProviderMock(.init()),
                                              mentionDisplayHelper: ComposerMentionDisplayHelper.mock,
                                              appSettings: appSettings,
-                                             analyticsService: AnalyticsServiceMock.default,
+                                             analyticsService: AnalyticsServiceMock(.init()),
                                              composerDraftService: draftServiceMock)
         
         var fulfillment = deferFulfillment(viewModel.context.$viewState, message: "Composer is disabled") { $0.canSend == false }
@@ -790,10 +790,10 @@ final class ComposerToolbarViewModelTests {
         viewModel = ComposerToolbarViewModel(roomProxy: roomProxyMock,
                                              wysiwygViewModel: wysiwygViewModel,
                                              completionSuggestionService: mockCompletionSuggestionService,
-                                             mediaProvider: MediaProviderMock(configuration: .init()),
+                                             mediaProvider: MediaProviderMock(.init()),
                                              mentionDisplayHelper: ComposerMentionDisplayHelper.mock,
                                              appSettings: appSettings,
-                                             analyticsService: AnalyticsServiceMock.default,
+                                             analyticsService: AnalyticsServiceMock(.init()),
                                              composerDraftService: draftServiceMock)
         
         let deferred = deferFulfillment(viewModel.context.$viewState, message: "Composer should be enabled") { $0.canSend == true }
@@ -816,10 +816,10 @@ final class ComposerToolbarViewModelTests {
                                              roomProxy: JoinedRoomProxyMock(.init()),
                                              wysiwygViewModel: wysiwygViewModel,
                                              completionSuggestionService: completionSuggestionServiceMock,
-                                             mediaProvider: MediaProviderMock(configuration: .init()),
+                                             mediaProvider: MediaProviderMock(.init()),
                                              mentionDisplayHelper: ComposerMentionDisplayHelper.mock,
                                              appSettings: appSettings,
-                                             analyticsService: AnalyticsServiceMock.default,
+                                             analyticsService: AnalyticsServiceMock(.init()),
                                              composerDraftService: draftServiceMock)
         viewModel.context.composerFormattingEnabled = true
     }

UnitTests/Sources/CreateRoomViewModelTests.swift

@@ -92,7 +92,7 @@ final class CreateRoomScreenViewModelTests {
                                                   spaceSelectionMode: .none,
                                                   shouldShowCancelButton: false,
                                                   userSession: userSession,
-                                                  analytics: AnalyticsServiceMock.default,
+                                                  analytics: AnalyticsServiceMock(.init()),
                                                   userIndicatorController: UserIndicatorControllerMock(),
                                                   appSettings: appSettings)
         self.viewModel = viewModel
@@ -342,7 +342,7 @@ final class CreateRoomScreenViewModelTests {
                                                   spaceSelectionMode: spacesSelectionMode,
                                                   shouldShowCancelButton: false,
                                                   userSession: userSession,
-                                                  analytics: AnalyticsServiceMock.default,
+                                                  analytics: AnalyticsServiceMock(.init()),
                                                   userIndicatorController: UserIndicatorControllerMock(),
                                                   appSettings: appSettings)
         self.viewModel = viewModel

UnitTests/Sources/GlobalSearchScreenViewModelTests.swift

@@ -17,7 +17,7 @@ struct GlobalSearchScreenViewModelTests {
     
     init() {
         viewModel = GlobalSearchScreenViewModel(roomSummaryProvider: RoomSummaryProviderMock(.init(state: .loaded(.mockRooms))),
-                                                mediaProvider: MediaProviderMock(configuration: .init()))
+                                                mediaProvider: MediaProviderMock(.init()))
         context = viewModel.context
     }
     

UnitTests/Sources/HomeScreenViewModelTests.swift

@@ -435,9 +435,9 @@ final class HomeScreenViewModelTests {
         viewModel = HomeScreenViewModel(userSession: userSession,
                                         selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
                                         appSettings: appSettings,
-                                        analyticsService: AnalyticsServiceMock.default,
+                                        analyticsService: AnalyticsServiceMock(.init()),
                                         notificationManager: notificationManager,
-                                        userIndicatorController: UserIndicatorControllerMock.default)
+                                        userIndicatorController: UserIndicatorControllerMock())
     }
 }
 

UnitTests/Sources/JoinRoomScreenViewModelTests.swift

@@ -203,7 +203,7 @@ final class JoinRoomScreenViewModelTests {
         viewModel = JoinRoomScreenViewModel(source: .generic(roomID: "1", via: []),
                                             appSettings: appSettings,
                                             userSession: UserSessionMock(.init(clientProxy: clientProxy)),
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            userIndicatorController: UserIndicatorControllerMock())
     }
 }
 

UnitTests/Sources/LocationSharingScreenViewModelTests.swift

@@ -401,9 +401,9 @@ struct LocationSharingScreenViewModelTests {
                                                    roomProxy: roomProxyMock,
                                                    timelineController: MockTimelineController(timelineProxy: TimelineProxyMock(.init())),
                                                    liveLocationManager: LiveLocationManagerMock(.init()),
-                                                   analytics: AnalyticsServiceMock.default,
+                                                   analytics: AnalyticsServiceMock(.init()),
                                                    userIndicatorController: UserIndicatorControllerMock(),
-                                                   mediaProvider: MediaProviderMock(configuration: .init()))
+                                                   mediaProvider: MediaProviderMock(.init()))
 
         // Initially no annotations and no map center since sender and share are both nil.
         #expect(context.viewState.annotations.isEmpty)
@@ -436,9 +436,9 @@ struct LocationSharingScreenViewModelTests {
                                                    roomProxy: JoinedRoomProxyMock(.init(members: members)),
                                                    timelineController: MockTimelineController(timelineProxy: timelineProxy),
                                                    liveLocationManager: LiveLocationManagerMock(liveLocationManagerConfiguration),
-                                                   analytics: AnalyticsServiceMock.default,
+                                                   analytics: AnalyticsServiceMock(.init()),
                                                    userIndicatorController: UserIndicatorControllerMock(),
-                                                   mediaProvider: MediaProviderMock(configuration: .init()))
+                                                   mediaProvider: MediaProviderMock(.init()))
         viewModel.state.bindings.isLocationAuthorized = true
     }
 
@@ -451,9 +451,9 @@ struct LocationSharingScreenViewModelTests {
                                                    roomProxy: JoinedRoomProxyMock(.init(members: members)),
                                                    timelineController: MockTimelineController(timelineProxy: timelineProxy),
                                                    liveLocationManager: liveLocationManagerMock,
-                                                   analytics: AnalyticsServiceMock.default,
+                                                   analytics: AnalyticsServiceMock(.init()),
                                                    userIndicatorController: UserIndicatorControllerMock(),
-                                                   mediaProvider: MediaProviderMock(configuration: .init()))
+                                                   mediaProvider: MediaProviderMock(.init()))
         viewModel.state.bindings.isLocationAuthorized = true
     }
     
@@ -473,9 +473,9 @@ struct LocationSharingScreenViewModelTests {
                                                    roomProxy: roomProxyMock,
                                                    timelineController: MockTimelineController(timelineProxy: TimelineProxyMock(.init())),
                                                    liveLocationManager: LiveLocationManagerMock(.init()),
-                                                   analytics: AnalyticsServiceMock.default,
+                                                   analytics: AnalyticsServiceMock(.init()),
                                                    userIndicatorController: UserIndicatorControllerMock(),
-                                                   mediaProvider: MediaProviderMock(configuration: .init()))
+                                                   mediaProvider: MediaProviderMock(.init()))
     }
     
     private func makeLiveLocationShare(userID: String, latitude: Double = 0.0, longitude: Double = 0.0) -> LiveLocationShare {

UnitTests/Sources/LoginScreenViewModelTests.swift

@@ -229,8 +229,8 @@ struct LoginScreenViewModelTests {
     private mutating func setupViewModel(homeserverAddress: String = "example.com", loginHint: String? = nil) async {
         let appSettings = AppSettings.volatile()
         
-        clientFactory = AuthenticationClientFactoryMock(configuration: .init())
-        service = AuthenticationService(userSessionStore: UserSessionStoreMock(configuration: .init()),
+        clientFactory = AuthenticationClientFactoryMock(.init())
+        service = AuthenticationService(userSessionStore: UserSessionStoreMock(.init()),
                                         encryptionKeyProvider: EncryptionKeyProvider(),
                                         classicAppManager: nil,
                                         clientFactory: clientFactory,
@@ -247,6 +247,6 @@ struct LoginScreenViewModelTests {
                                          loginHint: loginHint,
                                          userIndicatorController: UserIndicatorControllerMock(),
                                          appSettings: appSettings,
-                                         analytics: AnalyticsServiceMock.default)
+                                         analytics: AnalyticsServiceMock(.init()))
     }
 }

UnitTests/Sources/ManageRoomMemberSheetViewModelTests.swift

@@ -32,8 +32,8 @@ struct ManageRoomMemberSheetViewModelTests {
                                                    permissions: .init(canKick: true, canBan: true, ownPowerLevel: RoomMemberProxyMock.mockAdmin.powerLevel),
                                                    roomProxy: roomProxy,
                                                    userIndicatorController: UserIndicatorControllerMock(),
-                                                   analyticsService: AnalyticsServiceMock.default,
-                                                   mediaProvider: MediaProviderMock(configuration: .init()))
+                                                   analyticsService: AnalyticsServiceMock(.init()),
+                                                   mediaProvider: MediaProviderMock(.init()))
         
         let deferred = deferFulfillment(context.observe(\.viewState.bindings.alertInfo)) { $0 != nil }
         let deferredAction = deferFulfillment(viewModel.actions) { action in
@@ -64,8 +64,8 @@ struct ManageRoomMemberSheetViewModelTests {
                                                    permissions: .init(canKick: true, canBan: true, ownPowerLevel: RoomMemberProxyMock.mockAdmin.powerLevel),
                                                    roomProxy: roomProxy,
                                                    userIndicatorController: UserIndicatorControllerMock(),
-                                                   analyticsService: AnalyticsServiceMock.default,
-                                                   mediaProvider: MediaProviderMock(configuration: .init()))
+                                                   analyticsService: AnalyticsServiceMock(.init()),
+                                                   mediaProvider: MediaProviderMock(.init()))
         
         let deferred = deferFulfillment(context.observe(\.viewState.bindings.alertInfo)) { $0 != nil }
         context.send(viewAction: .ban)
@@ -87,8 +87,8 @@ struct ManageRoomMemberSheetViewModelTests {
                                                    permissions: .init(canKick: true, canBan: true, ownPowerLevel: RoomMemberProxyMock.mockAdmin.powerLevel),
                                                    roomProxy: roomProxy,
                                                    userIndicatorController: UserIndicatorControllerMock(),
-                                                   analyticsService: AnalyticsServiceMock.default,
-                                                   mediaProvider: MediaProviderMock(configuration: .init()))
+                                                   analyticsService: AnalyticsServiceMock(.init()),
+                                                   mediaProvider: MediaProviderMock(.init()))
         
         let deferredAction = deferFulfillment(viewModel.actions) { action in
             action == .dismiss(shouldShowDetails: true)

UnitTests/Sources/MediaUploadPreviewScreenViewModelTests.swift

@@ -31,7 +31,7 @@ final class MediaUploadPreviewScreenViewModelTests {
         appSettings = AppSettings.volatile()
         appSettings.optimizeMediaUploads = false
 
-        userIndicatorController = UserIndicatorControllerMock.default
+        userIndicatorController = UserIndicatorControllerMock()
     }
     
     @Test

UnitTests/Sources/NotificationContentBuilderTests.swift

@@ -20,7 +20,7 @@ struct NotificationContentBuilderTests {
         notificationContent = .init()
         let stringBuilder = RoomMessageEventStringBuilder(attributedStringBuilder: AttributedStringBuilder(mentionBuilder: PlainMentionBuilder()),
                                                           style: .plain)
-        mediaProvider = MediaProviderMock(configuration: .init())
+        mediaProvider = MediaProviderMock(.init())
         notificationContentBuilder = NotificationContentBuilder(messageEventStringBuilder: stringBuilder,
                                                                 notificationSoundName: UNNotificationSoundName("message.caf"),
                                                                 userSession: NSEUserSessionMock(.init()))

UnitTests/Sources/PillContextTests.swift

@@ -16,7 +16,7 @@ struct PillContextTests {
     @Test
     func user() async {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let id = "@test:matrix.org"
         let proxyMock = JoinedRoomProxyMock(.init(name: "Test"))
@@ -27,9 +27,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init()),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -50,7 +50,7 @@ struct PillContextTests {
     @Test
     func ownUser() {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let id = "@test:matrix.org"
         let proxyMock = JoinedRoomProxyMock(.init(name: "Test", ownUserID: id))
@@ -61,9 +61,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init()),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -75,7 +75,7 @@ struct PillContextTests {
     @Test
     func allUsers() {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let avatarURL = URL(string: "https://matrix.jpg")
         let id = "test_room"
@@ -88,9 +88,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init()),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -103,7 +103,7 @@ struct PillContextTests {
     @Test
     func roomIDMention() {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let proxyMock = JoinedRoomProxyMock(.init())
         let mockController = MockTimelineController()
@@ -115,9 +115,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init(clientProxy: clientMock)),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -131,7 +131,7 @@ struct PillContextTests {
     @Test
     func roomIDMentionMissingRoom() {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let proxyMock = JoinedRoomProxyMock(.init())
         let mockController = MockTimelineController()
@@ -141,9 +141,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init()),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -157,7 +157,7 @@ struct PillContextTests {
     @Test
     func roomAliasMention() {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let proxyMock = JoinedRoomProxyMock(.init())
         let mockController = MockTimelineController()
@@ -171,9 +171,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init(clientProxy: clientMock)),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -187,7 +187,7 @@ struct PillContextTests {
     @Test
     func roomAliasMentionMissingRoom() {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let proxyMock = JoinedRoomProxyMock(.init())
         let mockController = MockTimelineController()
@@ -197,9 +197,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init()),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -213,7 +213,7 @@ struct PillContextTests {
     @Test
     func eventOnRoomIDMention() {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let proxyMock = JoinedRoomProxyMock(.init())
         let mockController = MockTimelineController()
@@ -225,9 +225,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init(clientProxy: clientMock)),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -241,7 +241,7 @@ struct PillContextTests {
     @Test
     func eventOnRoomIDMentionMissingRoom() {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let proxyMock = JoinedRoomProxyMock(.init())
         let mockController = MockTimelineController()
@@ -251,9 +251,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init()),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -267,7 +267,7 @@ struct PillContextTests {
     @Test
     func eventOnRoomAliasMention() {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let proxyMock = JoinedRoomProxyMock(.init())
         let mockController = MockTimelineController()
@@ -281,9 +281,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init(clientProxy: clientMock)),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -297,7 +297,7 @@ struct PillContextTests {
     @Test
     func eventOnRoomAliasMentionMissingRoom() {
         let appSettings = AppSettings.volatile()
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let proxyMock = JoinedRoomProxyMock(.init())
         let mockController = MockTimelineController()
@@ -307,9 +307,9 @@ struct PillContextTests {
                                      userSession: UserSessionMock(.init()),
                                      mediaPlayerProvider: MediaPlayerProviderMock(),
                                      userIndicatorController: userIndicatorController,
-                                     appMediator: AppMediatorMock.default,
+                                     appMediator: AppMediatorMock(.init()),
                                      appSettings: appSettings,
-                                     analyticsService: AnalyticsServiceMock.default,
+                                     analyticsService: AnalyticsServiceMock(.init()),
                                      emojiProvider: EmojiProvider(appSettings: appSettings),
                                      linkMetadataProvider: LinkMetadataProvider(),
                                      timelineControllerFactory: TimelineControllerFactoryMock(.init()))

UnitTests/Sources/PollFormScreenViewModelTests.swift

@@ -179,7 +179,7 @@ struct PollFormScreenViewModelTests {
     private mutating func setupViewModel(mode: PollFormMode = .new(topic: nil)) {
         viewModel = PollFormScreenViewModel(mode: mode,
                                             timelineController: MockTimelineController(timelineProxy: timelineProxy),
-                                            analytics: AnalyticsServiceMock.default,
+                                            analytics: AnalyticsServiceMock(.init()),
                                             userIndicatorController: UserIndicatorControllerMock())
     }
 }

UnitTests/Sources/QRCodeLoginScreenViewModelTests.swift

@@ -242,7 +242,7 @@ struct QRCodeLoginScreenViewModelTests {
             screenMode = .linkMobile(linkNewDeviceService.linkMobileDevice(), clientProxy)
         }
         
-        appMediator = AppMediatorMock.default
+        appMediator = AppMediatorMock(.init())
         viewModel = QRCodeLoginScreenViewModel(mode: screenMode,
                                                canSignInManually: true,
                                                appMediator: appMediator)

UnitTests/Sources/RoomChangePermissionsScreenViewModelTests.swift

@@ -125,6 +125,6 @@ struct RoomChangePermissionsScreenViewModelTests {
                                                          ownPowerLevel: ownPowerLevel,
                                                          roomProxy: roomProxy,
                                                          userIndicatorController: UserIndicatorControllerMock(),
-                                                         analytics: AnalyticsServiceMock.default)
+                                                         analytics: AnalyticsServiceMock(.init()))
     }
 }

UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift

@@ -195,8 +195,8 @@ struct RoomChangeRolesScreenViewModelTests {
         roomProxy = JoinedRoomProxyMock(.init(members: .allMembersAsAdmin))
         viewModel = RoomChangeRolesScreenViewModel(mode: mode,
                                                    roomProxy: roomProxy,
-                                                   mediaProvider: MediaProviderMock(configuration: .init()),
+                                                   mediaProvider: MediaProviderMock(.init()),
                                                    userIndicatorController: UserIndicatorControllerMock(),
-                                                   analytics: AnalyticsServiceMock.default)
+                                                   analytics: AnalyticsServiceMock(.init()))
     }
 }

UnitTests/Sources/RoomDetailsEditScreenViewModelTests.swift

@@ -164,7 +164,7 @@ struct RoomDetailsEditScreenViewModelTests {
     // MARK: - Private
     
     private mutating func setupViewModel(roomProxyConfiguration: JoinedRoomProxyMockConfiguration) {
-        userIndicatorController = UserIndicatorControllerMock.default
+        userIndicatorController = UserIndicatorControllerMock()
         viewModel = .init(roomProxy: JoinedRoomProxyMock(roomProxyConfiguration),
                           userSession: UserSessionMock(.init()),
                           mediaUploadingPreprocessor: MediaUploadingPreprocessor(appSettings: .volatile()),

UnitTests/Sources/RoomDetailsScreenViewModelTests.swift

@@ -30,8 +30,8 @@ struct RoomDetailsScreenViewModelTests {
         notificationSettingsProxyMock = NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration())
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: notificationSettingsProxyMock,
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -43,8 +43,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", members: mockedMembers, joinRule: .public))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -63,8 +63,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", members: mockedMembers))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -84,8 +84,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", members: mockedMembers))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -142,8 +142,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", isDirect: true, isEncrypted: true, members: mockedMembers))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -163,8 +163,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", isDirect: true, isEncrypted: true, members: mockedMembers))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -194,8 +194,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", isDirect: true, isEncrypted: true, members: mockedMembers))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init(clientProxy: clientProxy)),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -224,8 +224,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", isDirect: true, isEncrypted: true, members: mockedMembers))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -255,8 +255,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", isDirect: true, isEncrypted: true, members: mockedMembers))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init(clientProxy: clientProxy)),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -287,8 +287,8 @@ struct RoomDetailsScreenViewModelTests {
                                                   powerLevelsConfiguration: .init(canUserInvite: false)))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -304,8 +304,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", members: mockedMembers, joinRule: .public))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -341,7 +341,7 @@ struct RoomDetailsScreenViewModelTests {
         
         roomProxyMock = JoinedRoomProxyMock(configuration)
         
-        let powerLevelsProxyMock = RoomPowerLevelsProxyMock(configuration: .init())
+        let powerLevelsProxyMock = RoomPowerLevelsProxyMock(.init())
         powerLevelsProxyMock.canUserUserIDSendStateEventClosure = { _, event in
             .success(event == .roomAvatar)
         }
@@ -356,8 +356,8 @@ struct RoomDetailsScreenViewModelTests {
         
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -380,7 +380,7 @@ struct RoomDetailsScreenViewModelTests {
         
         roomProxyMock = JoinedRoomProxyMock(configuration)
         
-        let powerLevelsProxyMock = RoomPowerLevelsProxyMock(configuration: .init())
+        let powerLevelsProxyMock = RoomPowerLevelsProxyMock(.init())
         powerLevelsProxyMock.canUserUserIDSendStateEventClosure = { _, event in
             .success(event == .roomName)
         }
@@ -395,8 +395,8 @@ struct RoomDetailsScreenViewModelTests {
         
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -419,7 +419,7 @@ struct RoomDetailsScreenViewModelTests {
         
         roomProxyMock = JoinedRoomProxyMock(configuration)
         
-        let powerLevelsProxyMock = RoomPowerLevelsProxyMock(configuration: .init())
+        let powerLevelsProxyMock = RoomPowerLevelsProxyMock(.init())
         powerLevelsProxyMock.canUserUserIDSendStateEventClosure = { _, event in
             .success(event == .roomTopic)
         }
@@ -434,8 +434,8 @@ struct RoomDetailsScreenViewModelTests {
         
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -454,8 +454,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", isDirect: false, members: mockedMembers))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -474,8 +474,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", isDirect: true, members: mockedMembers))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -492,8 +492,8 @@ struct RoomDetailsScreenViewModelTests {
         notificationSettingsProxyMock.getNotificationSettingsRoomIdIsEncryptedIsOneToOneThrowableError = NotificationSettingsError.Generic(msg: "error")
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: notificationSettingsProxyMock,
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -700,8 +700,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", isDirect: false, knockRequestsState: .loaded(mockedRequests), joinRule: .knock))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: notificationSettingsProxyMock,
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -721,8 +721,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", isDirect: false, knockRequestsState: .loading, joinRule: .knock))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: notificationSettingsProxyMock,
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -744,8 +744,8 @@ struct RoomDetailsScreenViewModelTests {
                                                   powerLevelsConfiguration: .init(canUserInvite: false)))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: notificationSettingsProxyMock,
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -767,8 +767,8 @@ struct RoomDetailsScreenViewModelTests {
         roomProxyMock = JoinedRoomProxyMock(.init(name: "Test", isDirect: true, members: mockedMembers, knockRequestsState: .loaded(mockedRequests), joinRule: .knock))
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: notificationSettingsProxyMock,
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())
@@ -794,8 +794,8 @@ struct RoomDetailsScreenViewModelTests {
         
         viewModel = RoomDetailsScreenViewModel(roomProxy: roomProxyMock,
                                                userSession: UserSessionMock(.init()),
-                                               analyticsService: AnalyticsServiceMock.default,
-                                               userIndicatorController: UserIndicatorControllerMock.default,
+                                               analyticsService: AnalyticsServiceMock(.init()),
+                                               userIndicatorController: UserIndicatorControllerMock(),
                                                notificationSettingsProxy: notificationSettingsProxyMock,
                                                attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
                                                appSettings: .volatile())

UnitTests/Sources/RoomFlowCoordinatorTests.swift

@@ -483,11 +483,11 @@ final class RoomFlowCoordinatorTests {
                                                   timelineControllerFactory: timelineControllerFactory,
                                                   emojiProvider: EmojiProvider(appSettings: appSettings),
                                                   linkMetadataProvider: LinkMetadataProvider(),
-                                                  appMediator: AppMediatorMock.default,
+                                                  appMediator: AppMediatorMock(.init()),
                                                   appSettings: appSettings,
                                                   appHooks: AppHooks(),
-                                                  analytics: AnalyticsServiceMock.default,
-                                                  userIndicatorController: UserIndicatorControllerMock.default,
+                                                  analytics: AnalyticsServiceMock(.init()),
+                                                  userIndicatorController: UserIndicatorControllerMock(),
                                                   notificationManager: NotificationManagerMock(),
                                                   stateMachineFactory: StateMachineFactory())
         

UnitTests/Sources/RoomMemberDetailsViewModelTests.swift

@@ -164,7 +164,7 @@ struct RoomMemberDetailsViewModelTests {
         try await waitForMemberToLoad.fulfill()
         
         clientProxy.directRoomForUserIDReturnValue = .success(nil)
-        clientProxy.userIdentityForFallBackToServerReturnValue = .success(UserIdentityProxyMock(configuration: .init(verificationState: .notVerified)))
+        clientProxy.userIdentityForFallBackToServerReturnValue = .success(UserIdentityProxyMock(.init(verificationState: .notVerified)))
         
         // The user identity becomes known, i.e. not unknown.
         let deferred = deferFulfillment(viewModel.context.$viewState.compactMap(\.bindings.inviteConfirmationUser)) {
@@ -211,8 +211,8 @@ struct RoomMemberDetailsViewModelTests {
         viewModel = RoomMemberDetailsScreenViewModel(userID: roomMemberProxyMock.userID,
                                                      roomProxy: roomProxyMock,
                                                      userSession: userSession,
-                                                     userIndicatorController: UserIndicatorControllerMock.default,
-                                                     analytics: AnalyticsServiceMock.default,
+                                                     userIndicatorController: UserIndicatorControllerMock(),
+                                                     analytics: AnalyticsServiceMock(.init()),
                                                      appSettings: .volatile())
     }
 }

UnitTests/Sources/RoomMembersFlowCoordinatorTests.swift

@@ -59,10 +59,10 @@ struct RoomMembersFlowCoordinatorTests {
                                                   timelineControllerFactory: TimelineControllerFactoryMock(.init()),
                                                   emojiProvider: EmojiProvider(appSettings: appSettings),
                                                   linkMetadataProvider: LinkMetadataProvider(),
-                                                  appMediator: AppMediatorMock.default,
+                                                  appMediator: AppMediatorMock(.init()),
                                                   appSettings: appSettings,
                                                   appHooks: AppHooks(),
-                                                  analytics: AnalyticsServiceMock.default,
+                                                  analytics: AnalyticsServiceMock(.init()),
                                                   userIndicatorController: UserIndicatorControllerMock(),
                                                   notificationManager: NotificationManagerMock(),
                                                   stateMachineFactory: stateMachineFactory)

UnitTests/Sources/RoomMembersListScreenViewModelTests.swift

@@ -277,8 +277,8 @@ struct RoomMembersListScreenViewModelTests {
 
         viewModel = RoomMembersListScreenViewModel(userSession: UserSessionMock(.init()),
                                                    roomProxy: roomProxy,
-                                                   userIndicatorController: UserIndicatorControllerMock.default,
-                                                   analytics: AnalyticsServiceMock.default)
+                                                   userIndicatorController: UserIndicatorControllerMock(),
+                                                   analytics: AnalyticsServiceMock(.init()))
 
         let context = viewModel.context
 
@@ -297,7 +297,7 @@ struct RoomMembersListScreenViewModelTests {
         roomProxy = JoinedRoomProxyMock(.init(name: "test", members: members))
         viewModel = RoomMembersListScreenViewModel(userSession: UserSessionMock(.init()),
                                                    roomProxy: roomProxy,
-                                                   userIndicatorController: UserIndicatorControllerMock.default,
-                                                   analytics: AnalyticsServiceMock.default)
+                                                   userIndicatorController: UserIndicatorControllerMock(),
+                                                   analytics: AnalyticsServiceMock(.init()))
     }
 }

UnitTests/Sources/RoomRolesAndPermissionsScreenViewModelTests.swift

@@ -84,6 +84,6 @@ struct RoomRolesAndPermissionsScreenViewModelTests {
         roomProxy = JoinedRoomProxyMock(.init(members: members))
         viewModel = RoomRolesAndPermissionsScreenViewModel(roomProxy: roomProxy,
                                                            userIndicatorController: UserIndicatorControllerMock(),
-                                                           analytics: AnalyticsServiceMock.default)
+                                                           analytics: AnalyticsServiceMock(.init()))
     }
 }

UnitTests/Sources/RoomScreenViewModelTests.swift

@@ -45,8 +45,8 @@ final class RoomScreenViewModelTests {
                                             ongoingCallRoomIDPublisher: .init(.init(nil)),
                                             appSettings: appSettings,
                                             appHooks: AppHooks(),
-                                            analyticsService: AnalyticsServiceMock.default,
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            analyticsService: AnalyticsServiceMock(.init()),
+                                            userIndicatorController: UserIndicatorControllerMock())
         self.viewModel = viewModel
         
         // check if in the default state is not showing but is indeed loading
@@ -126,8 +126,8 @@ final class RoomScreenViewModelTests {
                                             ongoingCallRoomIDPublisher: .init(.init(nil)),
                                             appSettings: appSettings,
                                             appHooks: AppHooks(),
-                                            analyticsService: AnalyticsServiceMock.default,
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            analyticsService: AnalyticsServiceMock(.init()),
+                                            userIndicatorController: UserIndicatorControllerMock())
         self.viewModel = viewModel
         
         // check if the banner is now in a loaded state and is showing the counter
@@ -187,8 +187,8 @@ final class RoomScreenViewModelTests {
                                             ongoingCallRoomIDPublisher: .init(.init(nil)),
                                             appSettings: appSettings,
                                             appHooks: AppHooks(),
-                                            analyticsService: AnalyticsServiceMock.default,
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            analyticsService: AnalyticsServiceMock(.init()),
+                                            userIndicatorController: UserIndicatorControllerMock())
         self.viewModel = viewModel
         
         // check if the banner is now in a loaded state and is showing the counter
@@ -229,7 +229,7 @@ final class RoomScreenViewModelTests {
         var configuration = JoinedRoomProxyMockConfiguration(id: "TestID", name: "StartingName", avatarURL: nil, hasOngoingCall: false)
         let roomProxyMock = JoinedRoomProxyMock(configuration)
         
-        let powerLevelsMock = RoomPowerLevelsProxyMock(configuration: .init())
+        let powerLevelsMock = RoomPowerLevelsProxyMock(.init())
         powerLevelsMock.canUserJoinCallUserIDReturnValue = .success(false)
         powerLevelsMock.canOwnUserJoinCallReturnValue = false
         roomProxyMock.powerLevelsReturnValue = .success(powerLevelsMock)
@@ -246,8 +246,8 @@ final class RoomScreenViewModelTests {
                                             ongoingCallRoomIDPublisher: .init(.init(nil)),
                                             appSettings: appSettings,
                                             appHooks: AppHooks(),
-                                            analyticsService: AnalyticsServiceMock.default,
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            analyticsService: AnalyticsServiceMock(.init()),
+                                            userIndicatorController: UserIndicatorControllerMock())
         self.viewModel = viewModel
         
         #expect(viewModel.state.roomTitle == "StartingName")
@@ -283,8 +283,8 @@ final class RoomScreenViewModelTests {
                                             ongoingCallRoomIDPublisher: ongoingCallRoomIDSubject.asCurrentValuePublisher(),
                                             appSettings: appSettings,
                                             appHooks: AppHooks(),
-                                            analyticsService: AnalyticsServiceMock.default,
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            analyticsService: AnalyticsServiceMock(.init()),
+                                            userIndicatorController: UserIndicatorControllerMock())
         self.viewModel = viewModel
         #expect(viewModel.state.shouldShowCallButton)
         
@@ -328,8 +328,8 @@ final class RoomScreenViewModelTests {
                                                 ongoingCallRoomIDPublisher: .init(.init(nil)),
                                                 appSettings: appSettings,
                                                 appHooks: AppHooks(),
-                                                analyticsService: AnalyticsServiceMock.default,
-                                                userIndicatorController: UserIndicatorControllerMock.default)
+                                                analyticsService: AnalyticsServiceMock(.init()),
+                                                userIndicatorController: UserIndicatorControllerMock())
             self.viewModel = viewModel
             viewModel.stop()
         }
@@ -349,8 +349,8 @@ final class RoomScreenViewModelTests {
                                             ongoingCallRoomIDPublisher: .init(.init(nil)),
                                             appSettings: appSettings,
                                             appHooks: AppHooks(),
-                                            analyticsService: AnalyticsServiceMock.default,
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            analyticsService: AnalyticsServiceMock(.init()),
+                                            userIndicatorController: UserIndicatorControllerMock())
         self.viewModel = viewModel
         
         var deferred = deferFulfillment(viewModel.context.$viewState) { state in
@@ -383,8 +383,8 @@ final class RoomScreenViewModelTests {
                                             ongoingCallRoomIDPublisher: .init(.init(nil)),
                                             appSettings: appSettings,
                                             appHooks: AppHooks(),
-                                            analyticsService: AnalyticsServiceMock.default,
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            analyticsService: AnalyticsServiceMock(.init()),
+                                            userIndicatorController: UserIndicatorControllerMock())
         self.viewModel = viewModel
         
         var deferred = deferFulfillment(viewModel.context.$viewState) { state in
@@ -412,8 +412,8 @@ final class RoomScreenViewModelTests {
                                             ongoingCallRoomIDPublisher: .init(.init(nil)),
                                             appSettings: appSettings,
                                             appHooks: AppHooks(),
-                                            analyticsService: AnalyticsServiceMock.default,
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            analyticsService: AnalyticsServiceMock(.init()),
+                                            userIndicatorController: UserIndicatorControllerMock())
         self.viewModel = viewModel
         
         // Loading state just does not appear at all
@@ -432,8 +432,8 @@ final class RoomScreenViewModelTests {
                                             ongoingCallRoomIDPublisher: .init(.init(nil)),
                                             appSettings: appSettings,
                                             appHooks: AppHooks(),
-                                            analyticsService: AnalyticsServiceMock.default,
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            analyticsService: AnalyticsServiceMock(.init()),
+                                            userIndicatorController: UserIndicatorControllerMock())
         self.viewModel = viewModel
         
         let deferred = deferFulfillment(viewModel.context.$viewState) { state in
@@ -459,8 +459,8 @@ final class RoomScreenViewModelTests {
                                             ongoingCallRoomIDPublisher: .init(.init(nil)),
                                             appSettings: appSettings,
                                             appHooks: AppHooks(),
-                                            analyticsService: AnalyticsServiceMock.default,
-                                            userIndicatorController: UserIndicatorControllerMock.default)
+                                            analyticsService: AnalyticsServiceMock(.init()),
+                                            userIndicatorController: UserIndicatorControllerMock())
         self.viewModel = viewModel
         
         let deferredInvisible = deferFailure(viewModel.context.$viewState,

UnitTests/Sources/ServerConfirmationScreenViewModelTests.swift

@@ -344,14 +344,14 @@ final class ServerConfirmationScreenViewModelTests {
         }
         
         // Manually create a configuration as the default homeserver address setting is immutable.
-        client = ClientSDKMock(configuration: .init(oAuthLoginURL: supportsOAuth ? "https://account.matrix.org/authorize" : nil,
-                                                    supportsOAuthCreatePrompt: supportsOAuthCreatePrompt,
-                                                    supportsPasswordLogin: supportsPasswordLogin,
-                                                    elementWellKnown: requiresElementPro ? "{\"version\":1,\"enforce_element_pro\":true}" : nil))
+        client = ClientSDKMock(.init(oAuthLoginURL: supportsOAuth ? "https://account.matrix.org/authorize" : nil,
+                                     supportsOAuthCreatePrompt: supportsOAuthCreatePrompt,
+                                     supportsPasswordLogin: supportsPasswordLogin,
+                                     elementWellKnown: requiresElementPro ? "{\"version\":1,\"enforce_element_pro\":true}" : nil))
         let configuration = AuthenticationClientFactoryMock.Configuration(homeserverClients: ["matrix.org": client])
         
-        clientFactory = AuthenticationClientFactoryMock(configuration: configuration)
-        service = AuthenticationService(userSessionStore: UserSessionStoreMock(configuration: .init()),
+        clientFactory = AuthenticationClientFactoryMock(configuration)
+        service = AuthenticationService(userSessionStore: UserSessionStoreMock(.init()),
                                         encryptionKeyProvider: EncryptionKeyProvider(),
                                         classicAppManager: nil,
                                         clientFactory: clientFactory,

UnitTests/Sources/ServerSelectionScreenViewModelTests.swift

@@ -150,8 +150,8 @@ struct ServerSelectionScreenViewModelTests {
     private mutating func setup(authenticationFlow: AuthenticationFlow) {
         let appSettings = AppSettings.volatile()
         
-        clientFactory = AuthenticationClientFactoryMock(configuration: .init())
-        service = AuthenticationService(userSessionStore: UserSessionStoreMock(configuration: .init()),
+        clientFactory = AuthenticationClientFactoryMock(.init())
+        service = AuthenticationService(userSessionStore: UserSessionStoreMock(.init()),
                                         encryptionKeyProvider: EncryptionKeyProvider(),
                                         classicAppManager: nil,
                                         clientFactory: clientFactory,

UnitTests/Sources/SessionVerificationViewModelTests.swift

@@ -22,7 +22,7 @@ struct SessionVerificationViewModelTests {
         viewModel = SessionVerificationScreenViewModel(sessionVerificationControllerProxy: sessionVerificationController,
                                                        flow: .deviceInitiator,
                                                        appSettings: .volatile(),
-                                                       mediaProvider: MediaProviderMock(configuration: .init()))
+                                                       mediaProvider: MediaProviderMock(.init()))
         context = viewModel.context
     }
 

UnitTests/Sources/StartChatViewModelTests.swift

@@ -27,7 +27,7 @@ struct StartChatScreenViewModelTests {
         userDiscoveryService.searchProfilesWithReturnValue = .success([])
         let userSession = UserSessionMock(.init(clientProxy: clientProxy))
         viewModel = StartChatScreenViewModel(userSession: userSession,
-                                             analytics: AnalyticsServiceMock.default,
+                                             analytics: AnalyticsServiceMock(.init()),
                                              userIndicatorController: UserIndicatorControllerMock(),
                                              userDiscoveryService: userDiscoveryService,
                                              appSettings: appSettings)
@@ -92,7 +92,7 @@ struct StartChatScreenViewModelTests {
     @Test
     func inviteConfirmationFetchesIdentity() async throws {
         clientProxy.directRoomForUserIDReturnValue = .success(nil)
-        clientProxy.userIdentityForFallBackToServerReturnValue = .success(UserIdentityProxyMock(configuration: .init(verificationState: .notVerified)))
+        clientProxy.userIdentityForFallBackToServerReturnValue = .success(UserIdentityProxyMock(.init(verificationState: .notVerified)))
         
         // User identity becomes known, i.e. not unknown
         let deferred = deferFulfillment(viewModel.context.$viewState.compactMap(\.bindings.selectedUserToInvite)) {

UnitTests/Sources/TimelineMediaPreviewViewModelTests.swift

@@ -295,7 +295,7 @@ struct TimelineMediaPreviewViewModelTests {
         timelineController = MockTimelineController(timelineKind: .media(.mediaFilesScreen))
         timelineController.timelineItems = initialItems
         
-        mediaProvider = MediaProviderMock(configuration: .init())
+        mediaProvider = MediaProviderMock(.init())
         photoLibraryManager = PhotoLibraryManagerMock(.init(authorizationDenied: photoLibraryAuthorizationDenied))
         
         viewModel = TimelineMediaPreviewViewModel(initialItem: initialItems[initialItemIndex],

UnitTests/Sources/TimelineViewModelTests.swift

@@ -312,10 +312,10 @@ final class TimelineViewModelTests {
                                           timelineController: timelineController,
                                           userSession: UserSessionMock(.init()),
                                           mediaPlayerProvider: MediaPlayerProviderMock(),
-                                          userIndicatorController: UserIndicatorControllerMock.default,
-                                          appMediator: AppMediatorMock.default,
+                                          userIndicatorController: UserIndicatorControllerMock(),
+                                          appMediator: AppMediatorMock(.init()),
                                           appSettings: appSettings,
-                                          analyticsService: AnalyticsServiceMock.default,
+                                          analyticsService: AnalyticsServiceMock(.init()),
                                           emojiProvider: EmojiProvider(appSettings: appSettings),
                                           linkMetadataProvider: LinkMetadataProvider(),
                                           timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -341,10 +341,10 @@ final class TimelineViewModelTests {
                                           timelineController: timelineController,
                                           userSession: UserSessionMock(.init()),
                                           mediaPlayerProvider: MediaPlayerProviderMock(),
-                                          userIndicatorController: UserIndicatorControllerMock.default,
-                                          appMediator: AppMediatorMock.default,
+                                          userIndicatorController: UserIndicatorControllerMock(),
+                                          appMediator: AppMediatorMock(.init()),
                                           appSettings: appSettings,
-                                          analyticsService: AnalyticsServiceMock.default,
+                                          analyticsService: AnalyticsServiceMock(.init()),
                                           emojiProvider: EmojiProvider(appSettings: appSettings),
                                           linkMetadataProvider: LinkMetadataProvider(),
                                           timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -368,10 +368,10 @@ final class TimelineViewModelTests {
                                           timelineController: MockTimelineController(),
                                           userSession: UserSessionMock(.init()),
                                           mediaPlayerProvider: MediaPlayerProviderMock(),
-                                          userIndicatorController: UserIndicatorControllerMock.default,
-                                          appMediator: AppMediatorMock.default,
+                                          userIndicatorController: UserIndicatorControllerMock(),
+                                          appMediator: AppMediatorMock(.init()),
                                           appSettings: appSettings,
-                                          analyticsService: AnalyticsServiceMock.default,
+                                          analyticsService: AnalyticsServiceMock(.init()),
                                           emojiProvider: EmojiProvider(appSettings: appSettings),
                                           linkMetadataProvider: LinkMetadataProvider(),
                                           timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -407,10 +407,10 @@ final class TimelineViewModelTests {
                                           timelineController: MockTimelineController(),
                                           userSession: UserSessionMock(.init()),
                                           mediaPlayerProvider: MediaPlayerProviderMock(),
-                                          userIndicatorController: UserIndicatorControllerMock.default,
-                                          appMediator: AppMediatorMock.default,
+                                          userIndicatorController: UserIndicatorControllerMock(),
+                                          appMediator: AppMediatorMock(.init()),
                                           appSettings: appSettings,
-                                          analyticsService: AnalyticsServiceMock.default,
+                                          analyticsService: AnalyticsServiceMock(.init()),
                                           emojiProvider: EmojiProvider(appSettings: appSettings),
                                           linkMetadataProvider: LinkMetadataProvider(),
                                           timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -446,10 +446,10 @@ final class TimelineViewModelTests {
                                           timelineController: MockTimelineController(),
                                           userSession: UserSessionMock(.init()),
                                           mediaPlayerProvider: MediaPlayerProviderMock(),
-                                          userIndicatorController: UserIndicatorControllerMock.default,
-                                          appMediator: AppMediatorMock.default,
+                                          userIndicatorController: UserIndicatorControllerMock(),
+                                          appMediator: AppMediatorMock(.init()),
                                           appSettings: appSettings,
-                                          analyticsService: AnalyticsServiceMock.default,
+                                          analyticsService: AnalyticsServiceMock(.init()),
                                           emojiProvider: EmojiProvider(appSettings: appSettings),
                                           linkMetadataProvider: LinkMetadataProvider(),
                                           timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -491,10 +491,10 @@ final class TimelineViewModelTests {
                                           timelineController: MockTimelineController(),
                                           userSession: UserSessionMock(.init()),
                                           mediaPlayerProvider: MediaPlayerProviderMock(),
-                                          userIndicatorController: UserIndicatorControllerMock.default,
-                                          appMediator: AppMediatorMock.default,
+                                          userIndicatorController: UserIndicatorControllerMock(),
+                                          appMediator: AppMediatorMock(.init()),
                                           appSettings: appSettings,
-                                          analyticsService: AnalyticsServiceMock.default,
+                                          analyticsService: AnalyticsServiceMock(.init()),
                                           emojiProvider: EmojiProvider(appSettings: appSettings),
                                           linkMetadataProvider: LinkMetadataProvider(),
                                           timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -522,10 +522,10 @@ final class TimelineViewModelTests {
                                           timelineController: MockTimelineController(),
                                           userSession: UserSessionMock(.init()),
                                           mediaPlayerProvider: MediaPlayerProviderMock(),
-                                          userIndicatorController: UserIndicatorControllerMock.default,
-                                          appMediator: AppMediatorMock.default,
+                                          userIndicatorController: UserIndicatorControllerMock(),
+                                          appMediator: AppMediatorMock(.init()),
                                           appSettings: appSettings,
-                                          analyticsService: AnalyticsServiceMock.default,
+                                          analyticsService: AnalyticsServiceMock(.init()),
                                           emojiProvider: EmojiProvider(appSettings: appSettings),
                                           linkMetadataProvider: LinkMetadataProvider(),
                                           timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -535,7 +535,7 @@ final class TimelineViewModelTests {
         }
         try await deferred.fulfill()
         
-        let powerLevelsProxyMock = RoomPowerLevelsProxyMock(configuration: .init())
+        let powerLevelsProxyMock = RoomPowerLevelsProxyMock(.init())
         powerLevelsProxyMock.canUserPinOrUnpinUserIDReturnValue = .success(false)
         powerLevelsProxyMock.canOwnUserPinOrUnpinReturnValue = false
         roomProxyMock.powerLevelsReturnValue = .success(powerLevelsProxyMock)
@@ -594,10 +594,10 @@ final class TimelineViewModelTests {
                                  timelineController: timelineController,
                                  userSession: UserSessionMock(.init()),
                                  mediaPlayerProvider: MediaPlayerProviderMock(),
-                                 userIndicatorController: UserIndicatorControllerMock.default,
-                                 appMediator: AppMediatorMock.default,
+                                 userIndicatorController: UserIndicatorControllerMock(),
+                                 appMediator: AppMediatorMock(.init()),
                                  appSettings: appSettings,
-                                 analyticsService: AnalyticsServiceMock.default,
+                                 analyticsService: AnalyticsServiceMock(.init()),
                                  emojiProvider: EmojiProvider(appSettings: appSettings),
                                  linkMetadataProvider: LinkMetadataProvider(),
                                  timelineControllerFactory: TimelineControllerFactoryMock(.init()))

UnitTests/Sources/UserDetailsEditScreenViewModelTests.swift

@@ -21,7 +21,7 @@ struct UserDetailsEditScreenViewModelTests {
     init() {
         viewModel = .init(userSession: UserSessionMock(.init()),
                           mediaUploadingPreprocessor: MediaUploadingPreprocessor(appSettings: .volatile()),
-                          userIndicatorController: UserIndicatorControllerMock.default)
+                          userIndicatorController: UserIndicatorControllerMock())
     }
     
     @Test

UnitTests/Sources/UserProfileScreenViewModelTests.swift

@@ -13,7 +13,7 @@ import Testing
 struct UserProfileScreenViewModelTests {
     @Test
     func initialState() async throws {
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let profile = UserProfileProxy(userID: "@alice:matrix.org", displayName: "Alice", avatarURL: .mockMXCAvatar)
         let clientProxy = ClientProxyMock(.init())
@@ -23,7 +23,7 @@ struct UserProfileScreenViewModelTests {
                                                    isPresentedModally: false,
                                                    userSession: UserSessionMock(.init(clientProxy: clientProxy)),
                                                    userIndicatorController: userIndicatorController,
-                                                   analytics: AnalyticsServiceMock.default,
+                                                   analytics: AnalyticsServiceMock(.init()),
                                                    appSettings: .volatile())
         let context = viewModel.context
         
@@ -37,7 +37,7 @@ struct UserProfileScreenViewModelTests {
     
     @Test
     func initialStateAccountOwner() async throws {
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let profile = UserProfileProxy(userID: RoomMemberProxyMock.mockMe.userID, displayName: "Me", avatarURL: .mockMXCAvatar)
         let clientProxy = ClientProxyMock(.init())
@@ -47,7 +47,7 @@ struct UserProfileScreenViewModelTests {
                                                    isPresentedModally: false,
                                                    userSession: UserSessionMock(.init(clientProxy: clientProxy)),
                                                    userIndicatorController: userIndicatorController,
-                                                   analytics: AnalyticsServiceMock.default,
+                                                   analytics: AnalyticsServiceMock(.init()),
                                                    appSettings: .volatile())
         let context = viewModel.context
         
@@ -61,7 +61,7 @@ struct UserProfileScreenViewModelTests {
     
     @Test
     func startingDmWithUnknownUserFetchesIdentity() async throws {
-        let userIndicatorController = UserIndicatorControllerMock.default
+        let userIndicatorController = UserIndicatorControllerMock()
 
         let profile = UserProfileProxy.mockAlice
         
@@ -73,7 +73,7 @@ struct UserProfileScreenViewModelTests {
                                                    isPresentedModally: false,
                                                    userSession: UserSessionMock(.init(clientProxy: clientProxy)),
                                                    userIndicatorController: userIndicatorController,
-                                                   analytics: AnalyticsServiceMock.default,
+                                                   analytics: AnalyticsServiceMock(.init()),
                                                    appSettings: .volatile())
         
         let context = viewModel.context

UnitTests/Sources/UserSessionFlowCoordinatorTests.swift

@@ -44,12 +44,12 @@ struct UserSessionFlowCoordinatorTests {
         let clientProxy = ClientProxyMock(.init(userID: "hi@bob", roomSummaryProvider: RoomSummaryProviderMock(.init(state: .loaded(.mockRooms)))))
         clientProxy.homeserverReachabilityPublisher = homeserverReachabilitySubject.asCurrentValuePublisher()
         
-        let networkMonitor = NetworkMonitorMock.default
+        let networkMonitor = NetworkMonitorMock(.init())
         networkMonitor.reachabilityPublisher = networkReachabilitySubject.asCurrentValuePublisher()
-        let appMediator = AppMediatorMock.default
+        let appMediator = AppMediatorMock(.init())
         appMediator.networkMonitor = networkMonitor
         
-        userIndicatorController = UserIndicatorControllerMock.default
+        userIndicatorController = UserIndicatorControllerMock()
         let appSettings = AppSettings.volatile()
 
         let flowParameters = CommonFlowParameters(userSession: UserSessionMock(.init(clientProxy: clientProxy)),
@@ -61,7 +61,7 @@ struct UserSessionFlowCoordinatorTests {
                                                   appMediator: appMediator,
                                                   appSettings: appSettings,
                                                   appHooks: AppHooks(),
-                                                  analytics: AnalyticsServiceMock.default,
+                                                  analytics: AnalyticsServiceMock(.init()),
                                                   userIndicatorController: userIndicatorController,
                                                   notificationManager: NotificationManagerMock(),
                                                   stateMachineFactory: stateMachineFactory)

UnitTests/Sources/VoiceMessageMediaManagerTests.swift

@@ -22,7 +22,7 @@ struct VoiceMessageMediaManagerTests {
     
     init() {
         voiceMessageCache = VoiceMessageCacheMock()
-        mediaProvider = MediaProviderMock(configuration: .init())
+        mediaProvider = MediaProviderMock(.init())
         mediaProvider.loadFileFromSourceFilenameClosure = nil
         mediaProvider.loadFileFromSourceFilenameReturnValue = .failure(.failedRetrievingFile)
         voiceMessageMediaManager = VoiceMessageMediaManager(mediaProvider: mediaProvider,