mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 10:33:45 +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
@@ -7,15 +7,17 @@
|
||||
//
|
||||
|
||||
@testable import ElementX
|
||||
import XCTest
|
||||
import Foundation
|
||||
import Testing
|
||||
|
||||
@Suite
|
||||
@MainActor
|
||||
class RoomPollsHistoryScreenViewModelTests: XCTestCase {
|
||||
struct RoomPollsHistoryScreenViewModelTests {
|
||||
var viewModel: RoomPollsHistoryScreenViewModelProtocol!
|
||||
var interactionHandler: PollInteractionHandlerMock!
|
||||
var timelineController: MockTimelineController!
|
||||
|
||||
override func setUpWithError() throws {
|
||||
init() throws {
|
||||
interactionHandler = PollInteractionHandlerMock()
|
||||
timelineController = MockTimelineController()
|
||||
viewModel = RoomPollsHistoryScreenViewModel(pollInteractionHandler: interactionHandler,
|
||||
@@ -23,7 +25,8 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
|
||||
userIndicatorController: UserIndicatorControllerMock())
|
||||
}
|
||||
|
||||
func testBackPaginate() async throws {
|
||||
@Test
|
||||
func backPaginate() async throws {
|
||||
timelineController.backPaginationResponses = [
|
||||
[PollRoomTimelineItem.mock(poll: .emptyDisclosed, isEditable: true),
|
||||
PollRoomTimelineItem.mock(poll: .disclosed(createdByAccountOwner: true)),
|
||||
@@ -37,11 +40,12 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
|
||||
|
||||
try await deferredViewState.fulfill()
|
||||
|
||||
XCTAssertEqual(viewModel.context.viewState.pollTimelineItems.count, 3)
|
||||
XCTAssertFalse(viewModel.context.viewState.canBackPaginate)
|
||||
#expect(viewModel.context.viewState.pollTimelineItems.count == 3)
|
||||
#expect(!viewModel.context.viewState.canBackPaginate)
|
||||
}
|
||||
|
||||
func testBackPaginateCanBackPaginate() async throws {
|
||||
@Test
|
||||
func backPaginateCanBackPaginate() async throws {
|
||||
timelineController.backPaginationResponses = [
|
||||
[PollRoomTimelineItem.mock(poll: .emptyDisclosed, isEditable: true),
|
||||
PollRoomTimelineItem.mock(poll: .disclosed(createdByAccountOwner: true)),
|
||||
@@ -56,11 +60,12 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
|
||||
|
||||
try await deferredViewState.fulfill()
|
||||
|
||||
XCTAssertEqual(viewModel.context.viewState.pollTimelineItems.count, 3)
|
||||
XCTAssert(viewModel.context.viewState.canBackPaginate)
|
||||
#expect(viewModel.context.viewState.pollTimelineItems.count == 3)
|
||||
#expect(viewModel.context.viewState.canBackPaginate)
|
||||
}
|
||||
|
||||
func testBackPaginateTwice() async throws {
|
||||
@Test
|
||||
func backPaginateTwice() async throws {
|
||||
timelineController.backPaginationResponses = [
|
||||
[PollRoomTimelineItem.mock(poll: .emptyDisclosed, isEditable: true),
|
||||
PollRoomTimelineItem.mock(poll: .disclosed(createdByAccountOwner: true)),
|
||||
@@ -74,11 +79,12 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
|
||||
|
||||
try await deferredViewState.fulfill()
|
||||
|
||||
XCTAssertEqual(viewModel.context.viewState.pollTimelineItems.count, 3)
|
||||
XCTAssert(viewModel.context.viewState.canBackPaginate)
|
||||
#expect(viewModel.context.viewState.pollTimelineItems.count == 3)
|
||||
#expect(viewModel.context.viewState.canBackPaginate)
|
||||
}
|
||||
|
||||
func testFilters() async throws {
|
||||
@Test
|
||||
func filters() async throws {
|
||||
timelineController.backPaginationResponses = [
|
||||
[PollRoomTimelineItem.mock(poll: .emptyDisclosed, isEditable: true),
|
||||
PollRoomTimelineItem.mock(poll: .disclosed(createdByAccountOwner: true)),
|
||||
@@ -96,13 +102,14 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
|
||||
|
||||
try await deferredViewState.fulfill()
|
||||
|
||||
XCTAssertEqual(viewModel.context.viewState.pollTimelineItems.count, 3)
|
||||
#expect(viewModel.context.viewState.pollTimelineItems.count == 3)
|
||||
|
||||
viewModel.context.send(viewAction: .filter(.past))
|
||||
XCTAssertEqual(viewModel.context.viewState.pollTimelineItems.count, 1)
|
||||
#expect(viewModel.context.viewState.pollTimelineItems.count == 1)
|
||||
}
|
||||
|
||||
func testEndPoll() async throws {
|
||||
@Test
|
||||
func endPoll() async throws {
|
||||
let deferred = deferFulfillment(interactionHandler.publisher.delay(for: 0.1, scheduler: DispatchQueue.main)) { _ in true }
|
||||
|
||||
interactionHandler.endPollPollStartIDReturnValue = .success(())
|
||||
@@ -110,11 +117,12 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
|
||||
|
||||
try await deferred.fulfill()
|
||||
|
||||
XCTAssert(interactionHandler.endPollPollStartIDCalled)
|
||||
XCTAssertEqual(interactionHandler.endPollPollStartIDReceivedPollStartID, "somePollID")
|
||||
#expect(interactionHandler.endPollPollStartIDCalled)
|
||||
#expect(interactionHandler.endPollPollStartIDReceivedPollStartID == "somePollID")
|
||||
}
|
||||
|
||||
func testEndPollFailure() async throws {
|
||||
@Test
|
||||
func endPollFailure() async throws {
|
||||
let deferred = deferFulfillment(viewModel.context.$viewState) { value in
|
||||
value.bindings.alertInfo != nil
|
||||
}
|
||||
@@ -124,11 +132,12 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
|
||||
|
||||
try await deferred.fulfill()
|
||||
|
||||
XCTAssert(interactionHandler.endPollPollStartIDCalled)
|
||||
XCTAssertEqual(interactionHandler.endPollPollStartIDReceivedPollStartID, "somePollID")
|
||||
#expect(interactionHandler.endPollPollStartIDCalled)
|
||||
#expect(interactionHandler.endPollPollStartIDReceivedPollStartID == "somePollID")
|
||||
}
|
||||
|
||||
func testSendPollResponse() async throws {
|
||||
@Test
|
||||
func sendPollResponse() async throws {
|
||||
let deferred = deferFulfillment(interactionHandler.publisher.delay(for: 0.1, scheduler: DispatchQueue.main)) { _ in true }
|
||||
|
||||
interactionHandler.sendPollResponsePollStartIDOptionIDReturnValue = .success(())
|
||||
@@ -136,12 +145,13 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
|
||||
|
||||
try await deferred.fulfill()
|
||||
|
||||
XCTAssert(interactionHandler.sendPollResponsePollStartIDOptionIDCalled)
|
||||
XCTAssertEqual(interactionHandler.sendPollResponsePollStartIDOptionIDReceivedInvocations[0].pollStartID, "somePollID")
|
||||
XCTAssertEqual(interactionHandler.sendPollResponsePollStartIDOptionIDReceivedInvocations[0].optionID, "someOptionID")
|
||||
#expect(interactionHandler.sendPollResponsePollStartIDOptionIDCalled)
|
||||
#expect(interactionHandler.sendPollResponsePollStartIDOptionIDReceivedInvocations[0].pollStartID == "somePollID")
|
||||
#expect(interactionHandler.sendPollResponsePollStartIDOptionIDReceivedInvocations[0].optionID == "someOptionID")
|
||||
}
|
||||
|
||||
func testSendPollResponseFailure() async throws {
|
||||
@Test
|
||||
func sendPollResponseFailure() async throws {
|
||||
let deferred = deferFulfillment(viewModel.context.$viewState) { value in
|
||||
value.bindings.alertInfo != nil
|
||||
}
|
||||
@@ -151,12 +161,13 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
|
||||
|
||||
try await deferred.fulfill()
|
||||
|
||||
XCTAssert(interactionHandler.sendPollResponsePollStartIDOptionIDCalled)
|
||||
XCTAssertEqual(interactionHandler.sendPollResponsePollStartIDOptionIDReceivedInvocations[0].pollStartID, "somePollID")
|
||||
XCTAssertEqual(interactionHandler.sendPollResponsePollStartIDOptionIDReceivedInvocations[0].optionID, "someOptionID")
|
||||
#expect(interactionHandler.sendPollResponsePollStartIDOptionIDCalled)
|
||||
#expect(interactionHandler.sendPollResponsePollStartIDOptionIDReceivedInvocations[0].pollStartID == "somePollID")
|
||||
#expect(interactionHandler.sendPollResponsePollStartIDOptionIDReceivedInvocations[0].optionID == "someOptionID")
|
||||
}
|
||||
|
||||
func testEditPoll() async throws {
|
||||
@Test
|
||||
func editPoll() async throws {
|
||||
let expectedPoll: Poll = .emptyDisclosed
|
||||
let expectedPollStartID = "someEventID"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user