* 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>
174 lines
8.4 KiB
Swift
174 lines
8.4 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2023-2025 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
@testable import ElementX
|
|
import SwiftUI
|
|
import Testing
|
|
|
|
@Suite
|
|
struct CollapsibleFlowLayoutTests {
|
|
@Test
|
|
func flowLayoutWithExpandAndCollapse() {
|
|
let containerSize = CGSize(width: 250, height: 400)
|
|
var flowLayout = CollapsibleReactionLayout(itemSpacing: 5, rowSpacing: 5, rowsBeforeCollapsible: 2)
|
|
|
|
var placedViews: [CGRect] = []
|
|
let placedViewsCallback = { rect in
|
|
placedViews.append(rect)
|
|
}
|
|
let subviews = createReactionLayoutSubviews(with: Array(repeating: CGSize(width: 100, height: 50), count: 6), placedPositionCallback: placedViewsCallback)
|
|
let subviewsMock = LayoutSubviewsMock(subviews: subviews)
|
|
var a: () = ()
|
|
var size = flowLayout.sizeThatFits(proposal: ProposedViewSize(containerSize), subviews: subviewsMock, cache: &a)
|
|
|
|
// Collapsed target layout has 2 rows of 2 items, so just 1 spacing between items hence 205, 105
|
|
#expect(size == CGSize(width: 205, height: 105))
|
|
flowLayout.placeSubviews(in: CGRect(origin: .zero, size: size), proposal: ProposedViewSize(containerSize), subviews: subviewsMock, cache: &a)
|
|
|
|
// 4 items are hidden in the collapsed state (put in the centre with zero size)
|
|
var targetPlacements: [CGRect] = [
|
|
CGRect(x: 0, y: 25, width: 100, height: 50),
|
|
CGRect(x: 105, y: 25, width: 100, height: 50),
|
|
CGRect(x: 0, y: 80, width: 100, height: 50),
|
|
CGRect(x: 105, y: 80, width: 100, height: 50),
|
|
CGRect(x: -10000, y: -10000, width: 0, height: 0),
|
|
CGRect(x: -10000, y: -10000, width: 0, height: 0),
|
|
CGRect(x: -10000, y: -10000, width: 0, height: 0),
|
|
CGRect(x: -10000, y: -10000, width: 0, height: 0)
|
|
]
|
|
#expect(placedViews == targetPlacements)
|
|
|
|
flowLayout.collapsed = false
|
|
placedViews = []
|
|
|
|
size = flowLayout.sizeThatFits(proposal: ProposedViewSize(containerSize), subviews: subviewsMock, cache: &a)
|
|
|
|
// Expanded target layout has 4 rows and no more than 2 items per row
|
|
#expect(size == CGSize(width: 205, height: 215))
|
|
|
|
flowLayout.placeSubviews(in: CGRect(origin: .zero, size: size), proposal: ProposedViewSize(containerSize), subviews: subviewsMock, cache: &a)
|
|
|
|
targetPlacements = [
|
|
CGRect(x: 0, y: 25, width: 100, height: 50),
|
|
CGRect(x: 105, y: 25, width: 100, height: 50),
|
|
CGRect(x: 0, y: 80, width: 100, height: 50),
|
|
CGRect(x: 105, y: 80, width: 100, height: 50),
|
|
CGRect(x: 0, y: 135, width: 100, height: 50),
|
|
CGRect(x: 105, y: 135, width: 100, height: 50),
|
|
CGRect(x: 0, y: 190, width: 100, height: 50),
|
|
CGRect(x: 105.0, y: 190, width: 100, height: 50)
|
|
]
|
|
#expect(placedViews == targetPlacements)
|
|
}
|
|
|
|
@Test
|
|
func flowLayoutWithExpandButtonAndAddMoreIsHidden() {
|
|
let containerSize = CGSize(width: 250, height: 400)
|
|
let flowLayout = CollapsibleReactionLayout(itemSpacing: 5, rowSpacing: 5, rowsBeforeCollapsible: 2)
|
|
|
|
var placedViews: [CGRect] = []
|
|
let placedViewsCallback = { rect in
|
|
placedViews.append(rect)
|
|
}
|
|
|
|
let subviews = createReactionLayoutSubviews(with: Array(repeating: CGSize(width: 100, height: 50), count: 3), placedPositionCallback: placedViewsCallback)
|
|
let subviewsMock = LayoutSubviewsMock(subviews: subviews)
|
|
var a: () = ()
|
|
let size = flowLayout.sizeThatFits(proposal: ProposedViewSize(containerSize), subviews: subviewsMock, cache: &a)
|
|
|
|
#expect(size == CGSize(width: 205, height: 105))
|
|
flowLayout.placeSubviews(in: CGRect(origin: .zero, size: size), proposal: ProposedViewSize(containerSize), subviews: subviewsMock, cache: &a)
|
|
|
|
let targetPlacements: [CGRect] = [
|
|
CGRect(x: 0, y: 25, width: 100, height: 50),
|
|
CGRect(x: 105, y: 25, width: 100, height: 50),
|
|
CGRect(x: 0, y: 80, width: 100, height: 50),
|
|
// Add more button
|
|
CGRect(x: 105.0, y: 80, width: 100, height: 50),
|
|
// Expand/Collapse button is hidden
|
|
CGRect(x: -10000, y: -10000, width: 0, height: 0)
|
|
]
|
|
#expect(placedViews == targetPlacements)
|
|
}
|
|
|
|
@Test
|
|
func heightIsCorrectGivenASmallerAddButton() {
|
|
let containerSize = CGSize(width: 250, height: 400)
|
|
let flowLayout = CollapsibleReactionLayout(itemSpacing: 5, rowSpacing: 5, rowsBeforeCollapsible: 2)
|
|
|
|
var placedViews: [CGRect] = []
|
|
let placedViewsCallback = { rect in
|
|
placedViews.append(rect)
|
|
}
|
|
|
|
// Add more button with smaller initial height
|
|
let subviews = createReactionLayoutSubviews(with: Array(repeating: CGSize(width: 100, height: 50), count: 2),
|
|
addMoreSize: CGSize(width: 100, height: 20),
|
|
placedPositionCallback: placedViewsCallback)
|
|
let subviewsMock = LayoutSubviewsMock(subviews: subviews)
|
|
var a: () = ()
|
|
let size = flowLayout.sizeThatFits(proposal: ProposedViewSize(containerSize), subviews: subviewsMock, cache: &a)
|
|
|
|
#expect(size == CGSize(width: 205, height: 105))
|
|
flowLayout.placeSubviews(in: CGRect(origin: .zero, size: size), proposal: ProposedViewSize(containerSize), subviews: subviewsMock, cache: &a)
|
|
|
|
let targetPlacements: [CGRect] = [
|
|
CGRect(x: 0, y: 25, width: 100, height: 50),
|
|
CGRect(x: 105, y: 25, width: 100, height: 50),
|
|
// Add more button with matching height
|
|
CGRect(x: 0, y: 80, width: 100, height: 50),
|
|
// Expand/Collapse button is hidden
|
|
CGRect(x: -10000, y: -10000, width: 0, height: 0)
|
|
]
|
|
#expect(placedViews == targetPlacements)
|
|
}
|
|
|
|
@Test
|
|
func flowLayoutEmptyState() {
|
|
let containerSize = CGSize(width: 250, height: 400)
|
|
let flowLayout = CollapsibleReactionLayout(itemSpacing: 5, rowSpacing: 5, rowsBeforeCollapsible: 2)
|
|
|
|
var placedViews: [CGRect] = []
|
|
let placedViewsCallback = { rect in
|
|
placedViews.append(rect)
|
|
}
|
|
let subviews = createReactionLayoutSubviews(with: [], placedPositionCallback: placedViewsCallback)
|
|
let subviewsMock = LayoutSubviewsMock(subviews: subviews)
|
|
var a: () = ()
|
|
let size = flowLayout.sizeThatFits(proposal: ProposedViewSize(containerSize), subviews: subviewsMock, cache: &a)
|
|
|
|
#expect(size == CGSize(width: 0, height: 0))
|
|
flowLayout.placeSubviews(in: CGRect(origin: .zero, size: size), proposal: ProposedViewSize(containerSize), subviews: subviewsMock, cache: &a)
|
|
|
|
let targetPlacements: [CGRect] = [
|
|
// both buttons are not displayed
|
|
CGRect(x: -10000, y: -10000, width: 0, height: 0),
|
|
CGRect(x: -10000, y: -10000, width: 0, height: 0)
|
|
]
|
|
#expect(placedViews == targetPlacements)
|
|
}
|
|
|
|
func createReactionLayoutSubviews(with sizes: [CGSize],
|
|
expandCollapseSize: CGSize = CGSize(width: 100, height: 50),
|
|
addMoreSize: CGSize = CGSize(width: 100, height: 50),
|
|
placedPositionCallback: @escaping (CGRect) -> Void) -> [LayoutSubviewMock] {
|
|
sizes.map { size in
|
|
LayoutSubviewMock(size: size,
|
|
layoutValues: [String(describing: ReactionLayoutItemType.self): ReactionLayoutItem.reaction],
|
|
placedPositionCallback: placedPositionCallback)
|
|
} + [
|
|
LayoutSubviewMock(size: expandCollapseSize,
|
|
layoutValues: [String(describing: ReactionLayoutItemType.self): ReactionLayoutItem.expandCollapse],
|
|
placedPositionCallback: placedPositionCallback),
|
|
LayoutSubviewMock(size: addMoreSize,
|
|
layoutValues: [String(describing: ReactionLayoutItemType.self): ReactionLayoutItem.addMore],
|
|
placedPositionCallback: placedPositionCallback)
|
|
]
|
|
}
|
|
}
|