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

Swift format enforce isEmpty rule (#5843)

Browse Source 
* swift format enforce isEmpty rule

* revert scheme

* use trailing closure
This commit is contained in:
Mauro
2026-07-06 15:39:16 +02:00
committed by GitHub
parent d2ef1e71f9
commit 0a77ba6c90
27 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnitTests/Sources/ChatsTabFlowCoordinatorTests.swift
+5 -5
View File
@@ -207,7 +207,7 @@ struct ChatsTabFlowCoordinatorTests {
mutating func roomClearsStack() async throws {
try await process(route: .room(roomID: "1", via: []), expectedState: .roomList(detailState: .room(roomID: "1")))
#expect(detailNavigationStack?.rootCoordinator is RoomScreenCoordinator)
#expect(detailNavigationStack?.stackCoordinators.count == 0)
#expect(detailNavigationStack?.stackCoordinators.isEmpty == true)
#expect(detailCoordinator != nil)
chatsTabFlowCoordinator.handleAppRoute(.childRoom(roomID: "2", via: []), animated: true)
@@ -219,7 +219,7 @@ struct ChatsTabFlowCoordinatorTests {
try await process(route: .room(roomID: "3", via: []), expectedState: .roomList(detailState: .room(roomID: "3")))
#expect(detailNavigationStack?.rootCoordinator is RoomScreenCoordinator)
#expect(detailNavigationStack?.stackCoordinators.count == 0)
#expect(detailNavigationStack?.stackCoordinators.isEmpty == true)
#expect(detailCoordinator != nil)
}
@@ -228,7 +228,7 @@ struct ChatsTabFlowCoordinatorTests {
// A regular event route should set its room as the root of the stack and focus on the event.
try await process(route: .event(eventID: "1", roomID: "1", via: []), expectedState: .roomList(detailState: .room(roomID: "1")))
#expect(detailNavigationStack?.rootCoordinator is RoomScreenCoordinator)
#expect(detailNavigationStack?.stackCoordinators.count == 0)
#expect(detailNavigationStack?.stackCoordinators.isEmpty == true)
#expect(detailCoordinator != nil)
#expect(timelineControllerFactory.buildTimelineControllerRoomProxyInitialFocussedEventIDTimelineItemFactoryMediaProviderCallsCount == 1)
#expect(timelineControllerFactory.buildTimelineControllerRoomProxyInitialFocussedEventIDTimelineItemFactoryMediaProviderReceivedArguments?.initialFocussedEventID == "1")
@@ -246,7 +246,7 @@ struct ChatsTabFlowCoordinatorTests {
// A subsequent regular event route should clear the stack and set the new room as the root of the stack.
try await process(route: .event(eventID: "3", roomID: "3", via: []), expectedState: .roomList(detailState: .room(roomID: "3")))
#expect(detailNavigationStack?.rootCoordinator is RoomScreenCoordinator)
#expect(detailNavigationStack?.stackCoordinators.count == 0)
#expect(detailNavigationStack?.stackCoordinators.isEmpty == true)
#expect(detailCoordinator != nil)
#expect(timelineControllerFactory.buildTimelineControllerRoomProxyInitialFocussedEventIDTimelineItemFactoryMediaProviderCallsCount == 3)
#expect(timelineControllerFactory.buildTimelineControllerRoomProxyInitialFocussedEventIDTimelineItemFactoryMediaProviderReceivedArguments?.initialFocussedEventID == "3")
@@ -254,7 +254,7 @@ struct ChatsTabFlowCoordinatorTests {
// A regular event route for the same room should set a new instance of the room as the root of the stack.
try await process(route: .event(eventID: "4", roomID: "3", via: []), expectedState: .roomList(detailState: .room(roomID: "3")))
#expect(detailNavigationStack?.rootCoordinator is RoomScreenCoordinator)
#expect(detailNavigationStack?.stackCoordinators.count == 0)
#expect(detailNavigationStack?.stackCoordinators.isEmpty == true)
#expect(detailCoordinator != nil)
#expect(timelineControllerFactory.buildTimelineControllerRoomProxyInitialFocussedEventIDTimelineItemFactoryMediaProviderCallsCount == 4)
#expect(timelineControllerFactory.buildTimelineControllerRoomProxyInitialFocussedEventIDTimelineItemFactoryMediaProviderReceivedArguments?.initialFocussedEventID == "4",
UnitTests/Sources/RoomFlowCoordinatorTests.swift
+17 -17
View File
@@ -68,7 +68,7 @@ final class RoomFlowCoordinatorTests {
try await process(route: .room(roomID: "1", via: []))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
try await process(route: .roomDetails(roomID: "1"))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
@@ -82,7 +82,7 @@ final class RoomFlowCoordinatorTests {
try await process(route: .room(roomID: "1", via: []))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
try await process(route: .childRoom(roomID: "2", via: []))
#expect(navigationStackCoordinator.stackCoordinators.count == 1)
@@ -95,7 +95,7 @@ final class RoomFlowCoordinatorTests {
try await clearRoute(expectedActions: [.finished])
#expect(navigationStackCoordinator.rootCoordinator == nil)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
}
/// Tests the child flow teardown in isolation of it's parent.
@@ -124,7 +124,7 @@ final class RoomFlowCoordinatorTests {
try await process(route: .room(roomID: "1", via: []))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
try await process(route: .childRoom(roomID: "2", via: []))
#expect(navigationStackCoordinator.stackCoordinators.count == 1)
@@ -142,10 +142,10 @@ final class RoomFlowCoordinatorTests {
try await process(route: .room(roomID: "1", via: []))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
try await process(route: .childRoom(roomID: "1", via: []))
#expect(navigationStackCoordinator.stackCoordinators.count == 0,
#expect(navigationStackCoordinator.stackCoordinators.isEmpty,
"A room flow shouldn't present a direct child for the same room.")
try await process(route: .childRoom(roomID: "2", via: []))
@@ -165,7 +165,7 @@ final class RoomFlowCoordinatorTests {
try await process(route: .room(roomID: "InvitedRoomID", via: []))
#expect(navigationStackCoordinator.rootCoordinator is JoinRoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
try await clearRoute(expectedActions: [.finished])
#expect(navigationStackCoordinator.rootCoordinator == nil)
@@ -174,7 +174,7 @@ final class RoomFlowCoordinatorTests {
try await process(route: .room(roomID: "InvitedRoomID", via: []))
#expect(navigationStackCoordinator.rootCoordinator is JoinRoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
// "Join" the room
clientProxy.roomForIdentifierClosure = { _ in
@@ -183,7 +183,7 @@ final class RoomFlowCoordinatorTests {
try await process(route: .room(roomID: "InvitedRoomID", via: []))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
}
@Test
@@ -224,11 +224,11 @@ final class RoomFlowCoordinatorTests {
try await process(route: .event(eventID: "1", roomID: "1", via: []))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
try await process(route: .childEvent(eventID: "2", roomID: "1", via: []))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
try await process(route: .childEvent(eventID: "3", roomID: "2", via: []))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
@@ -324,13 +324,13 @@ final class RoomFlowCoordinatorTests {
try await process(route: .room(roomID: "1", via: []))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
let sharePayload: ShareExtensionPayload = .mediaFiles(roomID: "1", mediaFiles: [.init(url: .picturesDirectory, suggestedName: nil)])
try await process(route: .share(sharePayload))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
#expect((navigationStackCoordinator.sheetCoordinator as? NavigationStackCoordinator)?.rootCoordinator is MediaUploadPreviewScreenCoordinator)
@@ -340,7 +340,7 @@ final class RoomFlowCoordinatorTests {
try await process(route: .share(sharePayload))
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
#expect((navigationStackCoordinator.sheetCoordinator as? NavigationStackCoordinator)?.rootCoordinator is MediaUploadPreviewScreenCoordinator)
}
@@ -350,13 +350,13 @@ final class RoomFlowCoordinatorTests {
try await process(route: .room(roomID: "1", via: []))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
let sharePayload: ShareExtensionPayload = .text(roomID: "1", text: "Important text")
try await process(route: .share(sharePayload))
#expect(navigationStackCoordinator.rootCoordinator is RoomScreenCoordinator)
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
#expect(navigationStackCoordinator.sheetCoordinator == nil, "The media upload sheet shouldn't be shown when sharing text.")
@@ -366,7 +366,7 @@ final class RoomFlowCoordinatorTests {
try await process(route: .share(sharePayload))
#expect(navigationStackCoordinator.stackCoordinators.count == 0)
#expect(navigationStackCoordinator.stackCoordinators.isEmpty)
#expect(navigationStackCoordinator.sheetCoordinator == nil, "The media upload sheet shouldn't be shown when sharing text.")
}
UnitTests/Sources/RoomMembersListScreenViewModelTests.swift
+4 -4
View File
@@ -79,7 +79,7 @@ struct RoomMembersListScreenViewModelTests {
try await deferred.fulfill()
#expect(viewModel.state.joinedMembersCount == 2)
#expect(viewModel.state.visibleJoinedMembers.count == 0)
#expect(viewModel.state.visibleJoinedMembers.isEmpty)
}
@Test
@@ -107,7 +107,7 @@ struct RoomMembersListScreenViewModelTests {
#expect(viewModel.state.joinedMembersCount == 0)
#expect(viewModel.state.visibleInvitedMembers.count == 1)
#expect(viewModel.state.visibleJoinedMembers.count == 0)
#expect(viewModel.state.visibleJoinedMembers.isEmpty)
}
@Test
@@ -122,7 +122,7 @@ struct RoomMembersListScreenViewModelTests {
#expect(viewModel.state.joinedMembersCount == 0)
#expect(viewModel.state.visibleInvitedMembers.count == 1)
#expect(viewModel.state.visibleJoinedMembers.count == 0)
#expect(viewModel.state.visibleJoinedMembers.isEmpty)
}
@Test
@@ -286,7 +286,7 @@ struct RoomMembersListScreenViewModelTests {
context.mode = .banned
try await deferred.fulfill()
deferred = deferFulfillment(context.$viewState) { $0.visibleBannedMembers.count == 0 && $0.bindings.mode == .members }
deferred = deferFulfillment(context.$viewState) { $0.visibleBannedMembers.isEmpty && $0.bindings.mode == .members }
subject.value = [RoomMemberProxyMock].allMembersAsAdmin
try await deferred.fulfill()
}
UnitTests/Sources/RoomScreenViewModelTests.swift
+1 -1
View File
@@ -51,7 +51,7 @@ final class RoomScreenViewModelTests {
// check if in the default state is not showing but is indeed loading
var deferred = deferFulfillment(viewModel.context.$viewState) { viewState in
viewState.pinnedEventsBannerState.count == 0
viewState.pinnedEventsBannerState.isEmpty
}
try await deferred.fulfill()
#expect(viewModel.context.viewState.pinnedEventsBannerState.isLoading)
UnitTests/Sources/SecurityAndPrivacyScreenViewModelTests.swift
+1 -1
View File
@@ -96,7 +96,7 @@ final class SecurityAndPrivacyScreenViewModelTests {
let space = singleRoom[0]
setupViewModel(joinedParentSpaces: [], joinRule: .restricted(rules: [.roomMembership(roomID: space.id)]))
let deferred = deferFulfillment(context.$viewState) { $0.selectableJoinedSpaces.count == 0 }
let deferred = deferFulfillment(context.$viewState) { $0.selectableJoinedSpaces.isEmpty }
try await deferred.fulfill()
#expect(context.viewState.currentSettings.accessType == .spaceMembers(spaceIDs: [space.id]))
UnitTests/Sources/SpaceListScreenViewModelTests.swift
+2 -2
View File
@@ -53,10 +53,10 @@ final class SpacesScreenViewModelTests {
@Test
func topLevelSpacesSubscription() async throws {
var deferred = deferFulfillment(context.observe(\.viewState.topLevelSpaces)) { $0.count == 0 }
var deferred = deferFulfillment(context.observe(\.viewState.topLevelSpaces)) { $0.isEmpty }
topLevelSpacesSubject.send([])
try await deferred.fulfill()
#expect(context.viewState.topLevelSpaces.count == 0)
#expect(context.viewState.topLevelSpaces.isEmpty)
deferred = deferFulfillment(context.observe(\.viewState.topLevelSpaces)) { $0.count == 1 }
topLevelSpacesSubject.send([
UnitTests/Sources/UserIndicatorControllerTests.swift
+2 -2
View File
@@ -39,7 +39,7 @@ struct UserIndicatorControllerTests {
indicatorController.retractAllIndicators()
#expect(indicatorController.indicatorQueue.count == 0)
#expect(indicatorController.indicatorQueue.isEmpty)
}
@Test
@@ -94,7 +94,7 @@ struct UserIndicatorControllerTests {
try await fulfillment.fulfill()
#expect(indicatorController.indicatorQueue.count == 0)
#expect(indicatorController.indicatorQueue.isEmpty)
#expect(indicatorController.activeIndicator == nil)
}
}