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,15 +8,17 @@
|
||||
|
||||
import Combine
|
||||
@testable import ElementX
|
||||
import XCTest
|
||||
import Foundation
|
||||
import Testing
|
||||
|
||||
@Suite
|
||||
@MainActor
|
||||
class SessionVerificationViewModelTests: XCTestCase {
|
||||
struct SessionVerificationViewModelTests {
|
||||
var viewModel: SessionVerificationScreenViewModelProtocol!
|
||||
var context: SessionVerificationViewModelType.Context!
|
||||
var sessionVerificationController: SessionVerificationControllerProxyMock!
|
||||
|
||||
override func setUpWithError() throws {
|
||||
init() throws {
|
||||
sessionVerificationController = SessionVerificationControllerProxyMock.configureMock()
|
||||
viewModel = SessionVerificationScreenViewModel(sessionVerificationControllerProxy: sessionVerificationController,
|
||||
flow: .deviceInitiator,
|
||||
@@ -25,24 +27,26 @@ class SessionVerificationViewModelTests: XCTestCase {
|
||||
context = viewModel.context
|
||||
}
|
||||
|
||||
func testRequestVerification() async throws {
|
||||
XCTAssertEqual(context.viewState.verificationState, .initial)
|
||||
@Test
|
||||
func requestVerification() async throws {
|
||||
#expect(context.viewState.verificationState == .initial)
|
||||
|
||||
context.send(viewAction: .requestVerification)
|
||||
|
||||
try await Task.sleep(for: .milliseconds(100))
|
||||
XCTAssert(sessionVerificationController.requestDeviceVerificationCallsCount == 1)
|
||||
XCTAssertEqual(context.viewState.verificationState, .requestingVerification)
|
||||
#expect(sessionVerificationController.requestDeviceVerificationCallsCount == 1)
|
||||
#expect(context.viewState.verificationState == .requestingVerification)
|
||||
}
|
||||
|
||||
func testVerificationCancellation() async throws {
|
||||
XCTAssertEqual(context.viewState.verificationState, .initial)
|
||||
@Test
|
||||
func verificationCancellation() async throws {
|
||||
#expect(context.viewState.verificationState == .initial)
|
||||
|
||||
context.send(viewAction: .requestVerification)
|
||||
|
||||
viewModel.stop()
|
||||
|
||||
XCTAssertEqual(context.viewState.verificationState, .cancelling)
|
||||
#expect(context.viewState.verificationState == .cancelling)
|
||||
|
||||
let deferred = deferFulfillment(context.$viewState) { state in
|
||||
state.verificationState == .cancelled
|
||||
@@ -50,114 +54,80 @@ class SessionVerificationViewModelTests: XCTestCase {
|
||||
|
||||
try await deferred.fulfill()
|
||||
|
||||
XCTAssertEqual(context.viewState.verificationState, .cancelled)
|
||||
#expect(context.viewState.verificationState == .cancelled)
|
||||
|
||||
context.send(viewAction: .restart)
|
||||
|
||||
XCTAssertEqual(context.viewState.verificationState, .initial)
|
||||
#expect(context.viewState.verificationState == .initial)
|
||||
|
||||
XCTAssert(sessionVerificationController.requestDeviceVerificationCallsCount == 1)
|
||||
XCTAssert(sessionVerificationController.cancelVerificationCallsCount == 1)
|
||||
#expect(sessionVerificationController.requestDeviceVerificationCallsCount == 1)
|
||||
#expect(sessionVerificationController.cancelVerificationCallsCount == 1)
|
||||
}
|
||||
|
||||
func testReceiveChallenge() {
|
||||
setupChallengeReceived()
|
||||
@Test
|
||||
mutating func receiveChallenge() async throws {
|
||||
try await setupChallengeReceived()
|
||||
}
|
||||
|
||||
func testAcceptChallenge() {
|
||||
setupChallengeReceived()
|
||||
@Test
|
||||
mutating func acceptChallenge() async throws {
|
||||
try await setupChallengeReceived()
|
||||
|
||||
let waitForAcceptance = XCTestExpectation(description: "Wait for acceptance")
|
||||
|
||||
let cancellable = sessionVerificationController.actions
|
||||
.delay(for: .seconds(0.1), scheduler: DispatchQueue.main) // Allow the view model to process the callback first.
|
||||
.sink { callback in
|
||||
switch callback {
|
||||
case .finished:
|
||||
waitForAcceptance.fulfill()
|
||||
default:
|
||||
XCTFail("Unexpected session verification controller callback")
|
||||
}
|
||||
let deferred = deferFulfillment(sessionVerificationController.actions
|
||||
.delay(for: .seconds(0.1), scheduler: DispatchQueue.main)) { callback in
|
||||
if case .finished = callback { return true }
|
||||
return false
|
||||
}
|
||||
|
||||
defer {
|
||||
cancellable.cancel()
|
||||
}
|
||||
|
||||
context.send(viewAction: .accept)
|
||||
|
||||
wait(for: [waitForAcceptance], timeout: 10.0)
|
||||
try await deferred.fulfill()
|
||||
|
||||
XCTAssertEqual(context.viewState.verificationState, .verified)
|
||||
XCTAssert(sessionVerificationController.approveVerificationCallsCount == 1)
|
||||
#expect(context.viewState.verificationState == .verified)
|
||||
#expect(sessionVerificationController.approveVerificationCallsCount == 1)
|
||||
}
|
||||
|
||||
func testDeclineChallenge() {
|
||||
setupChallengeReceived()
|
||||
@Test
|
||||
mutating func declineChallenge() async throws {
|
||||
try await setupChallengeReceived()
|
||||
|
||||
let expectation = XCTestExpectation(description: "Wait for cancellation")
|
||||
|
||||
let cancellable = sessionVerificationController.actions
|
||||
.delay(for: .seconds(0.1), scheduler: DispatchQueue.main) // Allow the view model to process the callback first.
|
||||
.sink { callback in
|
||||
switch callback {
|
||||
case .cancelled:
|
||||
expectation.fulfill()
|
||||
default:
|
||||
XCTFail("Unexpected session verification controller callback")
|
||||
}
|
||||
let deferred = deferFulfillment(sessionVerificationController.actions
|
||||
.delay(for: .seconds(0.1), scheduler: DispatchQueue.main)) { callback in
|
||||
if case .cancelled = callback { return true }
|
||||
return false
|
||||
}
|
||||
|
||||
defer {
|
||||
cancellable.cancel()
|
||||
}
|
||||
|
||||
context.send(viewAction: .decline)
|
||||
|
||||
wait(for: [expectation], timeout: 10.0)
|
||||
try await deferred.fulfill()
|
||||
|
||||
XCTAssertEqual(context.viewState.verificationState, .cancelled)
|
||||
XCTAssert(sessionVerificationController.declineVerificationCallsCount == 1)
|
||||
#expect(context.viewState.verificationState == .cancelled)
|
||||
#expect(sessionVerificationController.declineVerificationCallsCount == 1)
|
||||
}
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private func setupChallengeReceived() {
|
||||
let requestAcceptanceExpectation = XCTestExpectation(description: "Wait for request acceptance")
|
||||
let sasVerificationStartExpectation = XCTestExpectation(description: "Wait for SaS verification start")
|
||||
let verificationDataReceivalExpectation = XCTestExpectation(description: "Wait for Emoji data")
|
||||
|
||||
let cancellable = sessionVerificationController.actions
|
||||
.delay(for: .seconds(0.1), scheduler: DispatchQueue.main) // Allow the view model to process the callback first.
|
||||
.sink { callback in
|
||||
switch callback {
|
||||
case .acceptedVerificationRequest:
|
||||
requestAcceptanceExpectation.fulfill()
|
||||
case .startedSasVerification:
|
||||
sasVerificationStartExpectation.fulfill()
|
||||
case .receivedVerificationData:
|
||||
verificationDataReceivalExpectation.fulfill()
|
||||
default:
|
||||
break
|
||||
private mutating func setupChallengeReceived() async throws {
|
||||
let actionsPublisher = sessionVerificationController.actions.delay(for: .seconds(0.1), scheduler: DispatchQueue.main)
|
||||
let cancellable = actionsPublisher
|
||||
.sink { [context] action in
|
||||
if case .acceptedVerificationRequest = action {
|
||||
context?.send(viewAction: .startSasVerification)
|
||||
}
|
||||
}
|
||||
|
||||
defer {
|
||||
cancellable.cancel()
|
||||
}
|
||||
|
||||
let deferred = deferFulfillment(actionsPublisher,
|
||||
keyPath: \.self,
|
||||
transitionValues: [.acceptedVerificationRequest,
|
||||
.startedSasVerification,
|
||||
.receivedVerificationData(SessionVerificationControllerProxyMock.emojis)])
|
||||
context.send(viewAction: .requestVerification)
|
||||
wait(for: [requestAcceptanceExpectation], timeout: 10.0)
|
||||
XCTAssertEqual(context.viewState.verificationState, .verificationRequestAccepted)
|
||||
try await deferred.fulfill()
|
||||
|
||||
context.send(viewAction: .startSasVerification)
|
||||
wait(for: [sasVerificationStartExpectation], timeout: 10.0)
|
||||
XCTAssertEqual(context.viewState.verificationState, .sasVerificationStarted)
|
||||
#expect(context.viewState.verificationState == .showingChallenge(emojis: SessionVerificationControllerProxyMock.emojis))
|
||||
#expect(sessionVerificationController.requestDeviceVerificationCallsCount == 1)
|
||||
#expect(sessionVerificationController.startSasVerificationCallsCount == 1)
|
||||
|
||||
wait(for: [verificationDataReceivalExpectation], timeout: 10.0)
|
||||
XCTAssertEqual(context.viewState.verificationState, .showingChallenge(emojis: SessionVerificationControllerProxyMock.emojis))
|
||||
|
||||
XCTAssert(sessionVerificationController.requestDeviceVerificationCallsCount == 1)
|
||||
XCTAssert(sessionVerificationController.startSasVerificationCallsCount == 1)
|
||||
cancellable.cancel()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user