Fix new redundantSendable and redundantSwiftTestingSuite swiftformat errors

2026-10-31 08:15:24 +00:00 · 2026-03-04 13:54:08 +02:00
parent 72e70e7f95
commit 0ab6458e4e
134 changed files with 2 additions and 134 deletions
@@ -9,7 +9,7 @@
 import Foundation
@preconcurrency import MatrixRustSDK

-struct MediaSourceProxy: Hashable, Sendable {
+struct MediaSourceProxy: Hashable {
    /// The media source provided by Rust.
    let underlyingSource: MediaSource
    /// The media's mime type, used when loading the media's file.
@@ -14,7 +14,7 @@ import Foundation
 /// Its value is consistent only per timeline instance, it should **not** be used to identify an item across timeline instances.
 /// - eventOrTransactionID: Contains the 2 possible identifiers of an event, either it has a remote event id or
 /// a local transaction id, never both or none.
-enum TimelineItemIdentifier: Hashable, Sendable {
+enum TimelineItemIdentifier: Hashable {
    struct UniqueID: Hashable {
        let value: String
        
@@ -12,7 +12,6 @@ import Combine
 import SwiftUI
 import Testing

-@Suite
@MainActor
 struct PreviewTests {
    private struct SnapshotDevice {
@@ -8,7 +8,6 @@
@testable import ElementX
 import Testing

-@Suite
@MainActor
 struct TemplateScreenViewModelTests {
    var viewModel: TemplateScreenViewModelProtocol
@@ -10,7 +10,6 @@ import AVKit
@testable import ElementX
 import Testing

-@Suite
 struct AVMetadataMachineReadableCodeObjectExtensionsTest {
    @Test
    func decodeQRCodeVersion8() throws {
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 final class AnalyticsSettingsScreenViewModelTests {
    private var appSettings: AppSettings!
    private var viewModel: AnalyticsSettingsScreenViewModelProtocol!
@@ -11,7 +11,6 @@ import AnalyticsEvents
 import PostHog
 import Testing

-@Suite
 final class AnalyticsTests {
    private var appSettings: AppSettings
    private var analyticsClient: AnalyticsClientMock
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 final class AppLockScreenViewModelTests {
    var appSettings: AppSettings
    var appLockService: AppLockService
@@ -11,7 +11,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 final class AppLockServiceTests {
    private var keychainController: KeychainController
    private var appSettings: AppSettings
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct AppLockSetupSettingsScreenViewModelTests {
    var appLockService: AppLockServiceProtocol
    var keychainController: KeychainControllerMock
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 final class AppLockSetupBiometricsScreenViewModelTests {
    var appLockService: AppLockServiceMock
    var viewModel: AppLockSetupBiometricsScreenViewModelProtocol
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 final class AppLockSetupPINScreenViewModelTests {
    var appLockService: AppLockService!
    var keychainController: KeychainControllerMock!
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
 struct AppLockTimerTests {
    private let now = Date.now
    private var timer: AppLockTimer!
@@ -9,7 +9,6 @@
@testable import ElementX
 import Testing

-@Suite
 struct PINTextFieldTests {
    @Test
    func sanitize() {
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
 struct AppRouteURLParserTests {
    var appSettings: AppSettings
    var appRouteURLParser: AppRouteURLParser
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
 struct ArrayTests {
    @Test
    func grouping() {
@@ -10,7 +10,6 @@
 import SwiftUI
 import Testing

-@Suite
 struct AttributedStringBuilderTests {
    private let attributedStringBuilder: AttributedStringBuilder
    private let maxHeaderPointSize = ceil(UIFont.preferredFont(forTextStyle: .body).pointSize * 1.2)
@@ -9,7 +9,6 @@
@testable import ElementX
 import Testing

-@Suite
 struct AttributedStringTests {
    @Test
    func replacingFontWithPresentationIntent() throws {
@@ -12,7 +12,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 struct AudioPlayerStateTests {
    static let audioDuration = 10.0
    private var audioPlayerState: AudioPlayerState!
@@ -12,7 +12,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 struct AudioRecorderStateTests {
    private var audioRecorderState: AudioRecorderState!
    private var audioRecorderMock: AudioRecorderMock!
@@ -12,7 +12,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 struct AudioRecorderTests {
    private var audioRecorder: AudioRecorder!
    private var audioSessionMock: AudioSessionMock!
@@ -11,7 +11,6 @@ import Foundation
 import MatrixRustSDKMocks
 import Testing

-@Suite
@MainActor
 struct AuthenticationServiceTests {
    var client: ClientSDKMock!
@@ -12,7 +12,6 @@ import Testing
 import UIKit

@MainActor
-@Suite
 final class AuthenticationStartScreenViewModelTests {
    var clientFactory: AuthenticationClientFactoryMock!
    var client: ClientSDKMock!
@@ -12,7 +12,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 struct BlockedUsersScreenViewModelTests {
    @Test
    func initialState() async throws {
@@ -11,7 +11,6 @@ import Testing
 import UIKit

@MainActor
-@Suite
 struct BugReportScreenViewModelTests {
    let logFiles: [URL] = [URL(filePath: "/path/to/file1.log"), URL(filePath: "/path/to/file2.log")]
    
@@ -11,7 +11,6 @@ import Combine
 import Foundation
 import Testing

-@Suite
 final class BugReportServiceTests {
    var appSettings: AppSettings!
    var bugReportService: BugReportServiceProtocol!
@@ -11,7 +11,6 @@ import Combine
 import Foundation
 import Testing

-@Suite
@MainActor
 struct ChatsTabFlowCoordinatorTests {
    var clientProxy: ClientProxyMock!
@@ -10,7 +10,6 @@ import Combine
@testable import ElementX
 import Testing

-@Suite
@MainActor
 struct CompletionSuggestionServiceTests {
    @Test
@@ -13,7 +13,6 @@ import MatrixRustSDK
 import Testing
 import WysiwygComposer

-@Suite
@MainActor
 final class ComposerToolbarViewModelTests {
    private var appSettings: AppSettings!
@@ -10,7 +10,6 @@ import Combine
@testable import ElementX
 import Testing

-@Suite
@MainActor
 final class CreateRoomScreenViewModelTests {
    var viewModel: CreateRoomScreenViewModelProtocol!
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
 struct DateTests {
    let calendar = Calendar.current
    var startOfToday: Date {
@@ -11,7 +11,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 struct DeactivateAccountScreenViewModelTests {
    var clientProxy: ClientProxyMock!
    var viewModel: DeactivateAccountScreenViewModelProtocol!
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct DeclineAndBlockScreenViewModelTests {
    var viewModel: DeclineAndBlockScreenViewModelProtocol
    var clientProxy: ClientProxyMock
@@ -11,7 +11,6 @@ import Observation
 import Testing

@MainActor
-@Suite
 struct DeferredFulfillmentTests {
    private let observable = SomeObservable()
    
@@ -9,7 +9,6 @@
@testable import ElementX
 import Testing

-@Suite
@MainActor
 struct EditRoomAddressScreenViewModelTests {
    var viewModel: EditRoomAddressScreenViewModelProtocol!
@@ -11,7 +11,6 @@ import PushKit
 import Testing

@MainActor
-@Suite
 final class ElementCallServiceTests {
    private var callProvider: CXProviderMock!
    private var currentDate: Date!
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct EmojiPickerScreenViewModelTests {
    var timelineProxy: TimelineProxyMock!
    
@@ -10,7 +10,6 @@
 import Testing
 import UIKit

-@Suite
 struct EmojiProviderTests {
    @Test @MainActor
    func emojisLoadedCategoriesAreLoadedFromLoader() async {
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
 struct ExpiringTaskRunnerTests {
    enum ExpiringTaskTestError: Error {
        case failed
@@ -9,7 +9,6 @@
@testable import ElementX
 import Testing

-@Suite
 struct GeoURITests {
    @Test
    func validPositiveCoordinates() throws {
@@ -11,7 +11,6 @@ import Combine
 import Testing

@MainActor
-@Suite
 struct GlobalSearchScreenViewModelTests {
    var viewModel: GlobalSearchScreenViewModelProtocol!
    var context: GlobalSearchScreenViewModelType.Context!
@@ -11,7 +11,6 @@ import Combine
 import Testing

@MainActor
-@Suite
 struct HomeScreenRoomTests {
    var roomSummary: RoomSummary!
    
@@ -11,7 +11,6 @@ import Combine
 import Testing

@MainActor
-@Suite
 final class HomeScreenViewModelTests {
    var viewModel: HomeScreenViewModelProtocol!
    var context: HomeScreenViewModelType.Context! {
@@ -11,7 +11,6 @@ import Combine
 import Testing

@MainActor
-@Suite
 struct InviteUsersScreenViewModelTests {
    var viewModel: InviteUsersScreenViewModelProtocol!
    var userDiscoveryService: UserDiscoveryServiceMock!
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 final class JoinRoomScreenViewModelTests {
    private enum TestMode {
        case joined
@@ -11,7 +11,6 @@ import Foundation
 import KeychainAccess
 import Testing

-@Suite
 struct KeychainControllerTests {
    var keychain: KeychainController
    
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct KnockRequestsListScreenViewModelTests {
    init() {
        AppSettings.resetAllSettings()
@@ -10,7 +10,6 @@
 import SwiftUI
 import Testing

-@Suite
 struct CollapsibleFlowLayoutTests {
    @Test
    func flowLayoutWithExpandAndCollapse() {
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
 final class LocalizationTests {
    deinit {
        Bundle.overrideLocalizations = nil
@@ -11,7 +11,6 @@ import Foundation
@testable import MatrixRustSDK
 import Testing

-@Suite
 final class LoggingTests {
    private enum Constants {
        static let genericFailure = "Test failed"
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct LoginScreenViewModelTests {
    var viewModel: LoginScreenViewModelProtocol!
    var context: LoginScreenViewModelType.Context {
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct ManageRoomMemberSheetViewModelTests {
    private var viewModel: ManageRoomMemberSheetViewModel!
    private var context: ManageRoomMemberSheetViewModel.Context! {
@@ -10,7 +10,6 @@ import CoreLocation
@testable import ElementX
 import Testing

-@Suite
 struct MapTilerURLBuilderTests {
    private static let baseURL: URL = "http://www.foo.com"
    private static let apiKey = "some_key"
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
 struct MatrixEntityRegexTests {
    @Test
    func homeserver() {
@@ -12,7 +12,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 struct MediaPlayerProviderTests {
    private var mediaPlayerProvider: MediaPlayerProvider
    
@@ -12,7 +12,6 @@ import MatrixRustSDK
 import MatrixRustSDKMocks
 import Testing

-@Suite
 struct MediaLoaderTests {
    @Test
    func mediaRequestCoalescing() async throws {
@@ -12,7 +12,6 @@ import Kingfisher
 import SwiftUI
 import Testing

-@Suite
@MainActor
 struct MediaProviderTests {
    private var mediaLoader: MediaLoaderMock
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
@MainActor
 final class MediaUploadPreviewScreenViewModelTests {
    var timelineProxy: TimelineProxyMock!
@@ -11,7 +11,6 @@ import SwiftUI
 import Testing
 import UniformTypeIdentifiers

-@Suite
 final class MediaUploadingPreprocessorTests {
    let maxUploadSize: UInt = 100 * 1024 * 1024
    var appSettings: AppSettings!
@@ -11,7 +11,6 @@ import Combine
 import Testing

@MainActor
-@Suite
 struct MessageForwardingScreenViewModelTests {
    let forwardingItem = MessageForwardingItem(id: .event(uniqueID: .init("t1"), eventOrTransactionID: .eventID("t1")),
                                               roomID: "1",
@@ -11,7 +11,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 struct NavigationRootCoordinatorTests {
    private var navigationRootCoordinator: NavigationRootCoordinator
    
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
@MainActor
 struct NavigationSplitCoordinatorTests {
    private var navigationSplitCoordinator: NavigationSplitCoordinator
@@ -11,7 +11,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 struct NavigationStackCoordinatorTests {
    private var navigationStackCoordinator: NavigationStackCoordinator
    
@@ -11,7 +11,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 struct NavigationTabCoordinatorTests {
    enum TestTab { case tab, chats, spaces }
    private var navigationTabCoordinator: NavigationTabCoordinator<TestTab>
@@ -11,7 +11,6 @@ import MatrixRustSDK
 import Testing
 import UserNotifications

-@Suite
 struct NotificationContentBuilderTests {
    var notificationContentBuilder: NotificationContentBuilder
    var mediaProvider: MediaProviderMock
@@ -11,7 +11,6 @@ import Combine
 import NotificationCenter
 import Testing

-@Suite
@MainActor
 final class NotificationManagerTests {
    var notificationManager: NotificationManager!
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing

-@Suite
@MainActor
 struct NotificationSettingsEditScreenViewModelTests {
    private var viewModel: NotificationSettingsEditScreenViewModelProtocol!
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing

-@Suite
@MainActor
 struct NotificationSettingsScreenViewModelTests {
    private var viewModel: NotificationSettingsScreenViewModelProtocol
@@ -12,7 +12,6 @@ import MatrixRustSDK
 import Testing

 /// Just for API sanity checking, they're already properly tested in the SDK/Ruma
-@Suite
 struct PermalinkTests {
    @Test
    func userIdentifierPermalink() throws {
@@ -12,7 +12,6 @@ import Foundation
 import Testing

@MainActor
-@Suite
 struct PillContextTests {
    @Test
    func user() async {
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct PinnedEventsBannerStateTests {
    @Test
    func empty() {
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct PollFormScreenViewModelTests {
    private let timelineProxy = TimelineProxyMock(.init())
    
@@ -12,7 +12,6 @@ import MatrixRustSDKMocks
 import Testing

@MainActor
-@Suite
 struct QRCodeLoginScreenViewModelTests {
    private enum Mode { case login, linkDesktop, linkMobile }
    
@@ -9,7 +9,6 @@
@testable import ElementX
 import Testing

-@Suite
 struct RemotePreferenceTests {
    @Test
    func overrideAndReset() {
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct ReportContentScreenViewModelTests {
    let eventID = "test-id"
    let senderID = "@meany:server.com"
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct ReportRoomScreenViewModelTests {
    private var viewModel: ReportRoomScreenViewModelProtocol
    private var roomProxy: JoinedRoomProxyMock
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct ResolveVerifiedUserSendFailureScreenViewModelTests {
    private let roomProxy = JoinedRoomProxyMock(.init())
    
@@ -11,7 +11,6 @@ import Foundation
 import MatrixRustSDK
 import Testing

-@Suite
 struct RestorationTokenTests {
    @Test
    func decodeTokenWithSlidingSyncProxy() throws {
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct RoomChangePermissionsScreenViewModelTests {
    var roomProxy: JoinedRoomProxyMock!
    var viewModel: RoomChangePermissionsScreenViewModelProtocol!
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct RoomChangeRolesScreenViewModelTests {
    var viewModel: RoomChangeRolesScreenViewModelProtocol!
    var roomProxy: JoinedRoomProxyMock!
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing

-@Suite
@MainActor
 struct RoomDetailsEditScreenViewModelTests {
    var viewModel: RoomDetailsEditScreenViewModel!
@@ -13,7 +13,6 @@ import MatrixRustSDK
 import SwiftUI
 import Testing

-@Suite
@MainActor
 struct RoomDetailsScreenViewModelTests {
    var viewModel: RoomDetailsScreenViewModel!
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing

-@Suite
 struct RoomEventStringBuilderTests {
    private let ownUserID: String
    private let stringBuilder: RoomEventStringBuilder
@@ -11,7 +11,6 @@ import Combine
 import MatrixRustSDKMocks
 import Testing

-@Suite
@MainActor
 final class RoomFlowCoordinatorTests {
    var clientProxy: ClientProxyMock!
@@ -9,7 +9,6 @@
@testable import ElementX
 import Testing

-@Suite
 final class RoomListFiltersStateTests {
    var appSettings: AppSettings
    var state: RoomListFiltersState
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct RoomMemberDetailsViewModelTests {
    var viewModel: RoomMemberDetailsScreenViewModelProtocol!
    var roomProxyMock: JoinedRoomProxyMock!
@@ -10,7 +10,6 @@ import Combine
 import Testing

@MainActor
-@Suite
 struct RoomMembersFlowCoordinatorTests {
    var membersFlowCoordinator: RoomMembersFlowCoordinator!
    var navigationStackCoordinator: NavigationStackCoordinator!
@@ -11,7 +11,6 @@ import Combine
 import Testing

@MainActor
-@Suite
 struct RoomMembersListScreenViewModelTests {
    var viewModel: RoomMembersListScreenViewModel!
    var roomProxy: JoinedRoomProxyMock!
@@ -11,7 +11,6 @@ import Combine
 import MatrixRustSDK
 import Testing

-@Suite
@MainActor
 struct RoomNotificationSettingsScreenViewModelTests {
    var roomProxyMock: JoinedRoomProxyMock!
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing

-@Suite
 struct RoomPermissionsTests {
    @Test
    func fromRust() {
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
@MainActor
 struct RoomPollsHistoryScreenViewModelTests {
    var viewModel: RoomPollsHistoryScreenViewModelProtocol!
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct RoomRolesAndPermissionsScreenViewModelTests {
    var viewModel: RoomRolesAndPermissionsScreenViewModelProtocol!
    var roomProxy: JoinedRoomProxyMock!
@@ -13,7 +13,6 @@ import MatrixRustSDK
 import MatrixRustSDKMocks
 import Testing

-@Suite
@MainActor
 final class RoomScreenViewModelTests {
    private var viewModel: RoomScreenViewModel!
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing

-@Suite
 struct RoomStateEventStringBuilderTests {
    private let userID: String
    private let stringBuilder: RoomStateEventStringBuilder
@@ -11,7 +11,6 @@ import MatrixRustSDK
 import MatrixRustSDKMocks
 import Testing

-@Suite
@MainActor
 final class RoomSummaryProviderTests {
    private let baseFilters: [RoomListEntriesDynamicFilterKind] = [.any(filters: [.all(filters: [.nonSpace, .nonLeft]),
@@ -10,7 +10,6 @@
 import Foundation
 import Testing

-@Suite
 struct RoomSummaryTests {
    // swiftlint:disable:next large_tuple
    let roomDetails: (id: String, name: String, avatarURL: URL) = ("room_id", "Room Name", "mxc://hs.tld/room/avatar")
@@ -11,7 +11,6 @@ import MatrixRustSDK
 import MatrixRustSDKMocks
 import Testing

-@Suite
 struct RoomTests {
    @Test
    func callIntent() async {
@@ -11,7 +11,6 @@ import Combine
 import Testing

@MainActor
-@Suite
 struct SecureBackupLogoutConfirmationScreenViewModelTests {
    private var viewModel: SecureBackupLogoutConfirmationScreenViewModel
    private var context: SecureBackupLogoutConfirmationScreenViewModel.Context {
@@ -11,7 +11,6 @@ import Combine
 import MatrixRustSDK
 import Testing

-@Suite
@MainActor
 final class SecurityAndPrivacyScreenViewModelTests {
    var viewModel: SecurityAndPrivacyScreenViewModelProtocol!
@@ -10,7 +10,6 @@
 import Testing

@MainActor
-@Suite
 struct ServerConfirmationScreenViewStateTests {
    @Test
    func loginMessageString() {
--- a/Show More
+++ b/Show More