ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finish migration of UnitTests target from XCTestCase to Swift Testing (#5129)

Browse Source 
* 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
2026-02-24 12:20:01 +00:00
committed by GitHub
parent 62f193eda1
commit e58c5801fc
38 changed files with 3460 additions and 3304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnitTests/Sources/RoomDetailsEditScreenViewModelTests.swift
+61 -46
View File
@@ -8,10 +8,11 @@
@testable import ElementX
import MatrixRustSDK
import XCTest
import Testing
@Suite
@MainActor
class RoomDetailsEditScreenViewModelTests: XCTestCase {
struct RoomDetailsEditScreenViewModelTests {
var viewModel: RoomDetailsEditScreenViewModel!
var userIndicatorController: UserIndicatorControllerMock!
@@ -20,65 +21,74 @@ class RoomDetailsEditScreenViewModelTests: XCTestCase {
viewModel.context
}
func testCannotSaveOnLanding() {
@Test
mutating func cannotSaveOnLanding() {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
XCTAssertFalse(context.viewState.canSave)
#expect(!context.viewState.canSave)
}
func testCanEdit() async throws {
@Test
mutating func canEdit() async throws {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
let deferred = deferFulfillment(context.$viewState) { $0.canEditName }
try await deferred.fulfill()
XCTAssertTrue(context.viewState.canEditAvatar)
XCTAssertTrue(context.viewState.canEditName)
XCTAssertTrue(context.viewState.canEditTopic)
#expect(context.viewState.canEditAvatar)
#expect(context.viewState.canEditName)
#expect(context.viewState.canEditTopic)
}
func testCannotEdit() {
@Test
mutating func cannotEdit() {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMe]))
XCTAssertFalse(context.viewState.canEditAvatar)
XCTAssertFalse(context.viewState.canEditName)
XCTAssertFalse(context.viewState.canEditTopic)
#expect(!context.viewState.canEditAvatar)
#expect(!context.viewState.canEditName)
#expect(!context.viewState.canEditTopic)
}
func testNameDidChange() {
@Test
mutating func nameDidChange() {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
context.name = "name"
XCTAssertTrue(context.viewState.nameDidChange)
XCTAssertTrue(context.viewState.canSave)
#expect(context.viewState.nameDidChange)
#expect(context.viewState.canSave)
}
func testTopicDidChange() {
@Test
mutating func topicDidChange() {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
context.topic = "topic"
XCTAssertTrue(context.viewState.topicDidChange)
XCTAssertTrue(context.viewState.canSave)
#expect(context.viewState.topicDidChange)
#expect(context.viewState.canSave)
}
func testAvatarDidChange() {
@Test
mutating func avatarDidChange() {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", avatarURL: .mockMXCAvatar, members: [.mockMeAdmin]))
context.send(viewAction: .removeImage)
XCTAssertTrue(context.viewState.avatarDidChange)
XCTAssertTrue(context.viewState.canSave)
#expect(context.viewState.avatarDidChange)
#expect(context.viewState.canSave)
}
func testEmptyNameCannotBeSaved() {
@Test
mutating func emptyNameCannotBeSaved() {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
context.name = ""
XCTAssertFalse(context.viewState.canSave)
#expect(!context.viewState.canSave)
}
func testAvatarPickerShowsSheet() {
@Test
mutating func avatarPickerShowsSheet() {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
context.name = "name"
XCTAssertFalse(context.showMediaSheet)
#expect(!context.showMediaSheet)
context.send(viewAction: .presentMediaSource)
XCTAssertTrue(context.showMediaSheet)
#expect(context.showMediaSheet)
}
func testSaveTriggersViewModelAction() async throws {
@Test
mutating func saveTriggersViewModelAction() async throws {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
let deferred = deferFulfillment(viewModel.actions) { action in
@@ -89,67 +99,72 @@ class RoomDetailsEditScreenViewModelTests: XCTestCase {
context.send(viewAction: .save)
let action = try await deferred.fulfill()
XCTAssertEqual(action, .saveFinished)
#expect(action == .saveFinished)
}
func testCancelWithoutChanges() async throws {
@Test
mutating func cancelWithoutChanges() async throws {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
XCTAssertFalse(context.viewState.canSave)
XCTAssertNil(context.alertInfo)
#expect(!context.viewState.canSave)
#expect(context.alertInfo == nil)
let deferred = deferFulfillment(viewModel.actions) { $0 == .cancel }
context.send(viewAction: .cancel)
try await deferred.fulfill()
XCTAssertNil(context.alertInfo)
#expect(context.alertInfo == nil)
}
func testCancelWithChangesAndDiscard() async throws {
@Test
mutating func cancelWithChangesAndDiscard() async throws {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
context.name = "name"
XCTAssertTrue(context.viewState.canSave)
XCTAssertNil(context.alertInfo)
#expect(context.viewState.canSave)
#expect(context.alertInfo == nil)
context.send(viewAction: .cancel)
XCTAssertNotNil(context.alertInfo)
#expect(context.alertInfo != nil)
let deferred = deferFulfillment(viewModel.actions) { $0 == .cancel }
context.alertInfo?.secondaryButton?.action?() // Discard
try await deferred.fulfill()
}
func testCancelWithChangesAndSave() async throws {
@Test
mutating func cancelWithChangesAndSave() async throws {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
context.name = "name"
XCTAssertTrue(context.viewState.canSave)
XCTAssertNil(context.alertInfo)
#expect(context.viewState.canSave)
#expect(context.alertInfo == nil)
context.send(viewAction: .cancel)
XCTAssertNotNil(context.alertInfo)
#expect(context.alertInfo != nil)
let deferred = deferFulfillment(viewModel.actions) { $0 == .saveFinished }
context.alertInfo?.primaryButton.action?() // Save
try await deferred.fulfill()
}
func testErrorShownOnFailedFetchOfMedia() async {
@Test
mutating func errorShownOnFailedFetchOfMedia() async {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
viewModel.didSelectMediaUrl(url: .picturesDirectory)
try? await Task.sleep(for: .milliseconds(100))
XCTAssertNotNil(context.alertInfo)
#expect(context.alertInfo != nil)
}
func testDeleteAvatar() {
@Test
mutating func deleteAvatar() {
setupViewModel(roomProxyConfiguration: .init(name: "Some room", avatarURL: .mockMXCAvatar, members: [.mockMeAdmin]))
XCTAssertNotNil(context.viewState.avatarURL)
#expect(context.viewState.avatarURL != nil)
context.send(viewAction: .removeImage)
XCTAssertNil(context.viewState.avatarURL)
#expect(context.viewState.avatarURL == nil)
}
// MARK: - Private
private func setupViewModel(roomProxyConfiguration: JoinedRoomProxyMockConfiguration) {
private mutating func setupViewModel(roomProxyConfiguration: JoinedRoomProxyMockConfiguration) {
userIndicatorController = UserIndicatorControllerMock.default
viewModel = .init(roomProxy: JoinedRoomProxyMock(roomProxyConfiguration),
userSession: UserSessionMock(.init()),