mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 12:07:55 +00:00
Finish migration of UnitTests target from XCTestCase to Swift Testing (#5129)
* Initial plan * Migrate 3 test files from XCTest to Swift Testing - MediaUploadPreviewScreenViewModelTests: @MainActor @Suite struct with init(), BundleFinder class for Bundle(for:), mutating test/setup functions, [self] capture replacing [weak self] in closures - NotificationManagerTests: @MainActor @Suite final class with init()/deinit, expectation/fulfillment(of:) replaced with confirmation(...), test_ prefix stripped - NotificationSettingsScreenViewModelTests: @MainActor @Suite struct with init() throws, non-optional stored properties, test prefix stripped Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate 3 XCTest files to Swift Testing - NotificationSettingsEditScreenViewModelTests: @MainActor @Suite struct with init() throws, mutating test methods - TimelineViewModelTests: @MainActor @Suite final class with init() async throws + deinit - AttributedStringBuilderTests: @Suite struct with init() async throws All XCT assertions replaced with #expect/#require/Issue.record Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate 4 test files from XCTest to Swift Testing - TimelineMediaPreviewViewModelTests: @Suite struct, mutating @Test funcs, testLoadingItem renamed to loadingItem (called internally by other tests) - ServerConfirmationScreenViewModelTests: @Suite final class with init()/deinit - CompletionSuggestionServiceTests: @Suite struct with init() - RoomFlowCoordinatorTests: @Suite final class with deinit Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate 4 test files from XCTest to Swift Testing - VoiceMessageRecorderTests: @Suite struct with init() async throws, added BundleFinder class for Bundle lookup, migrated all assertions - SpaceScreenViewModelTests: @Suite struct, private mutating setupViewModel, all test funcs mutating, XCTestExpectation → confirmation - RoomNotificationSettingsScreenViewModelTests: @Suite struct with init() throws, cancellable tests marked mutating - JoinRoomScreenViewModelTests: @Suite final class with init()/deinit, XCTestExpectation → confirmation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate 6 test files from XCTestCase to Swift Testing Co-authored-by: pixlwave <6060466+pixlwave@users.noreply.github.com> * Fix trailing blank line in RoomPollsHistoryScreenViewModelTests Co-authored-by: pixlwave <6060466+pixlwave@users.noreply.github.com> * Migrate 3 test files from XCTest to Swift Testing - MediaUploadingPreprocessorTests: @Suite final class with init()/deinit, removed executionTimeAllowance, XCTAssertEqual(accuracy:) → abs(Double) - SecurityAndPrivacyScreenViewModelTests: @MainActor @Suite final class, 5 expectation+fulfillment → await confirmation(...) - CreateRoomViewModelTests: @MainActor @Suite final class, 4 expectation+fulfillment → await confirmation(...) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate RoomScreenViewModelTests and RoomDetailsScreenViewModelTests to Swift Testing - Replace XCTest with Testing framework - RoomScreenViewModelTests: final class with init() async throws + deinit - RoomDetailsScreenViewModelTests: struct with init() and mutating funcs - Convert XCT assertions to #expect / Issue.record - Convert XCTestExpectation patterns to confirmation { confirm in } - Strip 'test' prefix from all test function names Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate ComposerToolbarViewModelTests from XCTest to Swift Testing - Replace import XCTest with import Testing - Convert XCTestCase class to @MainActor @Suite final class - Replace setUp()/tearDown() with init()/deinit - Strip 'test' prefix from all 41 test method names and add @Test - Replace XCTAssert* with #expect()/#require() - Replace try XCTUnwrap() with try #require() - Convert expectation+wait patterns to deferFulfillment with PassthroughSubject - Convert isInverted expectation to boolean flag checked after await - Use deferFulfillment on $viewState for state-transition tests Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address comments with Copilot. * Fix the failing tests. * Fixed flaky tests (#5137) resolved flaky tests * Tweaks and fixes. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: pixlwave <6060466+pixlwave@users.noreply.github.com> Co-authored-by: Doug <douglase@element.io> Co-authored-by: Mauro <34335419+Velin92@users.noreply.github.com>
This commit is contained in:
Copilot
GitHub
@@ -8,10 +8,11 @@
|
||||
|
||||
@testable import ElementX
|
||||
import MatrixRustSDK
|
||||
import XCTest
|
||||
import Testing
|
||||
|
||||
@Suite
|
||||
@MainActor
|
||||
class NotificationSettingsEditScreenViewModelTests: XCTestCase {
|
||||
struct NotificationSettingsEditScreenViewModelTests {
|
||||
private var viewModel: NotificationSettingsEditScreenViewModelProtocol!
|
||||
private var notificationSettingsProxy: NotificationSettingsProxyMock!
|
||||
private var userSession: UserSessionMock!
|
||||
@@ -21,7 +22,7 @@ class NotificationSettingsEditScreenViewModelTests: XCTestCase {
|
||||
viewModel.context
|
||||
}
|
||||
|
||||
@MainActor override func setUpWithError() throws {
|
||||
init() throws {
|
||||
notificationSettingsProxy = NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration())
|
||||
notificationSettingsProxy.getDefaultRoomNotificationModeIsEncryptedIsOneToOneReturnValue = .allMessages
|
||||
|
||||
@@ -29,7 +30,8 @@ class NotificationSettingsEditScreenViewModelTests: XCTestCase {
|
||||
userSession = UserSessionMock(.init(clientProxy: clientProxy))
|
||||
}
|
||||
|
||||
func testFetchSettings() async throws {
|
||||
@Test
|
||||
mutating func fetchSettings() async throws {
|
||||
notificationSettingsProxy.getDefaultRoomNotificationModeIsEncryptedIsOneToOneClosure = { isEncrypted, isOneToOne in
|
||||
switch (isEncrypted, isOneToOne) {
|
||||
case (_, true):
|
||||
@@ -49,21 +51,22 @@ class NotificationSettingsEditScreenViewModelTests: XCTestCase {
|
||||
// `getDefaultRoomNotificationModeIsEncryptedIsOneToOne` must have been called twice (for encrypted and unencrypted group chats)
|
||||
let invocations = notificationSettingsProxy.getDefaultRoomNotificationModeIsEncryptedIsOneToOneReceivedInvocations
|
||||
|
||||
XCTAssertEqual(invocations.count, 2)
|
||||
#expect(invocations.count == 2)
|
||||
// First call for encrypted group chats
|
||||
XCTAssertEqual(invocations[0].isEncrypted, true)
|
||||
XCTAssertEqual(invocations[0].isOneToOne, false)
|
||||
#expect(invocations[0].isEncrypted == true)
|
||||
#expect(invocations[0].isOneToOne == false)
|
||||
// Second call for unencrypted group chats
|
||||
XCTAssertEqual(invocations[1].isEncrypted, false)
|
||||
XCTAssertEqual(invocations[1].isOneToOne, false)
|
||||
#expect(invocations[1].isEncrypted == false)
|
||||
#expect(invocations[1].isOneToOne == false)
|
||||
|
||||
XCTAssertEqual(context.viewState.defaultMode, .mentionsAndKeywordsOnly)
|
||||
XCTAssertNil(context.viewState.bindings.alertInfo)
|
||||
XCTAssertFalse(context.viewState.canPushEncryptedEvents)
|
||||
XCTAssertNotNil(context.viewState.description(for: .mentionsAndKeywordsOnly))
|
||||
#expect(context.viewState.defaultMode == .mentionsAndKeywordsOnly)
|
||||
#expect(context.viewState.bindings.alertInfo == nil)
|
||||
#expect(!context.viewState.canPushEncryptedEvents)
|
||||
#expect(context.viewState.description(for: .mentionsAndKeywordsOnly) != nil)
|
||||
}
|
||||
|
||||
func testFetchSettingsWithCanPushEncryptedEvents() async throws {
|
||||
@Test
|
||||
mutating func fetchSettingsWithCanPushEncryptedEvents() async throws {
|
||||
notificationSettingsProxy.getDefaultRoomNotificationModeIsEncryptedIsOneToOneClosure = { isEncrypted, isOneToOne in
|
||||
switch (isEncrypted, isOneToOne) {
|
||||
case (_, true):
|
||||
@@ -86,21 +89,22 @@ class NotificationSettingsEditScreenViewModelTests: XCTestCase {
|
||||
// `getDefaultRoomNotificationModeIsEncryptedIsOneToOne` must have been called twice (for encrypted and unencrypted group chats)
|
||||
let invocations = notificationSettingsProxy.getDefaultRoomNotificationModeIsEncryptedIsOneToOneReceivedInvocations
|
||||
|
||||
XCTAssertEqual(invocations.count, 2)
|
||||
#expect(invocations.count == 2)
|
||||
// First call for encrypted group chats
|
||||
XCTAssertEqual(invocations[0].isEncrypted, true)
|
||||
XCTAssertEqual(invocations[0].isOneToOne, false)
|
||||
#expect(invocations[0].isEncrypted == true)
|
||||
#expect(invocations[0].isOneToOne == false)
|
||||
// Second call for unencrypted group chats
|
||||
XCTAssertEqual(invocations[1].isEncrypted, false)
|
||||
XCTAssertEqual(invocations[1].isOneToOne, false)
|
||||
#expect(invocations[1].isEncrypted == false)
|
||||
#expect(invocations[1].isOneToOne == false)
|
||||
|
||||
XCTAssertEqual(context.viewState.defaultMode, .mentionsAndKeywordsOnly)
|
||||
XCTAssertNil(context.viewState.bindings.alertInfo)
|
||||
XCTAssertTrue(context.viewState.canPushEncryptedEvents)
|
||||
XCTAssertNil(context.viewState.description(for: .mentionsAndKeywordsOnly))
|
||||
#expect(context.viewState.defaultMode == .mentionsAndKeywordsOnly)
|
||||
#expect(context.viewState.bindings.alertInfo == nil)
|
||||
#expect(context.viewState.canPushEncryptedEvents)
|
||||
#expect(context.viewState.description(for: .mentionsAndKeywordsOnly) == nil)
|
||||
}
|
||||
|
||||
func testSetModeAllMessages() async throws {
|
||||
@Test
|
||||
mutating func setModeAllMessages() async throws {
|
||||
notificationSettingsProxy.getDefaultRoomNotificationModeIsEncryptedIsOneToOneReturnValue = .mentionsAndKeywordsOnly
|
||||
viewModel = NotificationSettingsEditScreenViewModel(chatType: .groupChat, userSession: userSession)
|
||||
let deferred = deferFulfillment(viewModel.context.observe(\.viewState.defaultMode)) { $0 != nil }
|
||||
@@ -118,26 +122,27 @@ class NotificationSettingsEditScreenViewModelTests: XCTestCase {
|
||||
|
||||
// `setDefaultRoomNotificationModeIsEncryptedIsOneToOneMode` must have been called twice (for encrypted and unencrypted group chats)
|
||||
let invocations = notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeReceivedInvocations
|
||||
XCTAssertEqual(notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeCallsCount, 2)
|
||||
#expect(notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeCallsCount == 2)
|
||||
// First call for encrypted group chats
|
||||
XCTAssertEqual(invocations[0].isEncrypted, true)
|
||||
XCTAssertEqual(invocations[0].isOneToOne, false)
|
||||
XCTAssertEqual(invocations[0].mode, .allMessages)
|
||||
#expect(invocations[0].isEncrypted == true)
|
||||
#expect(invocations[0].isOneToOne == false)
|
||||
#expect(invocations[0].mode == .allMessages)
|
||||
// Second call for unencrypted group chats
|
||||
XCTAssertEqual(invocations[1].isEncrypted, false)
|
||||
XCTAssertEqual(invocations[1].isOneToOne, false)
|
||||
XCTAssertEqual(invocations[1].mode, .allMessages)
|
||||
#expect(invocations[1].isEncrypted == false)
|
||||
#expect(invocations[1].isOneToOne == false)
|
||||
#expect(invocations[1].mode == .allMessages)
|
||||
|
||||
deferredViewState = deferFulfillment(viewModel.context.observe(\.viewState.defaultMode),
|
||||
transitionValues: [.allMessages])
|
||||
|
||||
try await deferredViewState.fulfill()
|
||||
|
||||
XCTAssertEqual(context.viewState.defaultMode, .allMessages)
|
||||
XCTAssertNil(context.viewState.bindings.alertInfo)
|
||||
#expect(context.viewState.defaultMode == .allMessages)
|
||||
#expect(context.viewState.bindings.alertInfo == nil)
|
||||
}
|
||||
|
||||
func testSetModeMentions() async throws {
|
||||
@Test
|
||||
mutating func setModeMentions() async throws {
|
||||
viewModel = NotificationSettingsEditScreenViewModel(chatType: .groupChat, userSession: userSession)
|
||||
|
||||
let deferred = deferFulfillment(viewModel.context.observe(\.viewState.defaultMode)) { $0 != nil }
|
||||
@@ -155,26 +160,27 @@ class NotificationSettingsEditScreenViewModelTests: XCTestCase {
|
||||
|
||||
// `setDefaultRoomNotificationModeIsEncryptedIsOneToOneMode` must have been called twice (for encrypted and unencrypted group chats)
|
||||
let invocations = notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeReceivedInvocations
|
||||
XCTAssertEqual(notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeCallsCount, 2)
|
||||
#expect(notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeCallsCount == 2)
|
||||
// First call for encrypted group chats
|
||||
XCTAssertEqual(invocations[0].isEncrypted, true)
|
||||
XCTAssertEqual(invocations[0].isOneToOne, false)
|
||||
XCTAssertEqual(invocations[0].mode, .mentionsAndKeywordsOnly)
|
||||
#expect(invocations[0].isEncrypted == true)
|
||||
#expect(invocations[0].isOneToOne == false)
|
||||
#expect(invocations[0].mode == .mentionsAndKeywordsOnly)
|
||||
// Second call for unencrypted group chats
|
||||
XCTAssertEqual(invocations[1].isEncrypted, false)
|
||||
XCTAssertEqual(invocations[1].isOneToOne, false)
|
||||
XCTAssertEqual(invocations[1].mode, .mentionsAndKeywordsOnly)
|
||||
#expect(invocations[1].isEncrypted == false)
|
||||
#expect(invocations[1].isOneToOne == false)
|
||||
#expect(invocations[1].mode == .mentionsAndKeywordsOnly)
|
||||
|
||||
deferredViewState = deferFulfillment(viewModel.context.observe(\.viewState.defaultMode),
|
||||
transitionValues: [.mentionsAndKeywordsOnly])
|
||||
|
||||
try await deferredViewState.fulfill()
|
||||
|
||||
XCTAssertEqual(context.viewState.defaultMode, .mentionsAndKeywordsOnly)
|
||||
XCTAssertNil(context.viewState.bindings.alertInfo)
|
||||
#expect(context.viewState.defaultMode == .mentionsAndKeywordsOnly)
|
||||
#expect(context.viewState.bindings.alertInfo == nil)
|
||||
}
|
||||
|
||||
func testSetModeDirectChats() async throws {
|
||||
@Test
|
||||
mutating func setModeDirectChats() async throws {
|
||||
notificationSettingsProxy.getDefaultRoomNotificationModeIsEncryptedIsOneToOneReturnValue = .mentionsAndKeywordsOnly
|
||||
// Initialize for direct chats
|
||||
viewModel = NotificationSettingsEditScreenViewModel(chatType: .oneToOneChat, userSession: userSession)
|
||||
@@ -194,18 +200,19 @@ class NotificationSettingsEditScreenViewModelTests: XCTestCase {
|
||||
|
||||
// `setDefaultRoomNotificationModeIsEncryptedIsOneToOneMode` must have been called twice (for encrypted and unencrypted direct chats)
|
||||
let invocations = notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeReceivedInvocations
|
||||
XCTAssertEqual(notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeCallsCount, 2)
|
||||
#expect(notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeCallsCount == 2)
|
||||
// First call for encrypted direct chats
|
||||
XCTAssertEqual(invocations[0].isEncrypted, true)
|
||||
XCTAssertEqual(invocations[0].isOneToOne, true)
|
||||
XCTAssertEqual(invocations[0].mode, .allMessages)
|
||||
#expect(invocations[0].isEncrypted == true)
|
||||
#expect(invocations[0].isOneToOne == true)
|
||||
#expect(invocations[0].mode == .allMessages)
|
||||
// Second call for unencrypted direct chats
|
||||
XCTAssertEqual(invocations[1].isEncrypted, false)
|
||||
XCTAssertEqual(invocations[1].isOneToOne, true)
|
||||
XCTAssertEqual(invocations[1].mode, .allMessages)
|
||||
#expect(invocations[1].isEncrypted == false)
|
||||
#expect(invocations[1].isOneToOne == true)
|
||||
#expect(invocations[1].mode == .allMessages)
|
||||
}
|
||||
|
||||
func testSetModeFailure() async throws {
|
||||
@Test
|
||||
mutating func setModeFailure() async throws {
|
||||
notificationSettingsProxy.getDefaultRoomNotificationModeIsEncryptedIsOneToOneReturnValue = .mentionsAndKeywordsOnly
|
||||
notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeThrowableError = NotificationSettingsError.Generic(msg: "error")
|
||||
viewModel = NotificationSettingsEditScreenViewModel(chatType: .oneToOneChat, userSession: userSession)
|
||||
@@ -223,10 +230,11 @@ class NotificationSettingsEditScreenViewModelTests: XCTestCase {
|
||||
|
||||
try await deferredViewState.fulfill()
|
||||
|
||||
XCTAssertNotNil(context.viewState.bindings.alertInfo)
|
||||
#expect(context.viewState.bindings.alertInfo != nil)
|
||||
}
|
||||
|
||||
func testSelectRoom() async throws {
|
||||
@Test
|
||||
mutating func selectRoom() async throws {
|
||||
let roomID = "!roomidentifier:matrix.org"
|
||||
viewModel = NotificationSettingsEditScreenViewModel(chatType: .oneToOneChat, userSession: userSession)
|
||||
|
||||
@@ -243,7 +251,7 @@ class NotificationSettingsEditScreenViewModelTests: XCTestCase {
|
||||
|
||||
let expectedAction = NotificationSettingsEditScreenViewModelAction.requestRoomNotificationSettingsPresentation(roomID: roomID)
|
||||
guard case let .requestRoomNotificationSettingsPresentation(roomID: receivedRoomID) = sentAction, receivedRoomID == roomID else {
|
||||
XCTFail("Expected action \(expectedAction), but was \(sentAction)")
|
||||
Issue.record("Expected action \(expectedAction), but was \(sentAction)")
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user