From 101a5073825aac4fd5053a7e94189e40baeb8635 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sun, 15 Jun 2025 21:26:29 +0100 Subject: [PATCH 1/6] WIP --- Tests/Tests/TestUtils.swift | 2 +- Tests/Tests/ViewTypes/ButtonTests.swift | 2 +- Tests/Tests/ViewTypes/ColorPickerTests.swift | 2 +- Tests/Tests/ViewTypes/DatePickerTests.swift | 2 +- .../ViewTypes/DatePickerWithCompactFieldStyleTests.swift | 2 +- Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift | 2 +- .../ViewTypes/DatePickerWithGraphicalStyleTests.swift | 2 +- .../ViewTypes/DatePickerWithStepperFieldStyleTests.swift | 2 +- Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift | 2 +- Tests/Tests/ViewTypes/FormTests.swift | 2 +- Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift | 2 +- Tests/Tests/ViewTypes/FullScreenCoverTests.swift | 2 +- Tests/Tests/ViewTypes/ListCellTests.swift | 4 ++-- Tests/Tests/ViewTypes/ListTests.swift | 6 +++--- Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift | 2 +- .../Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift | 2 +- Tests/Tests/ViewTypes/MapTests.swift | 2 +- Tests/Tests/ViewTypes/NavigationSplitViewTests.swift | 4 ++-- Tests/Tests/ViewTypes/NavigationStackTests.swift | 4 ++-- .../ViewTypes/NavigationViewWithColumnsStyleTests.swift | 4 ++-- .../ViewTypes/NavigationViewWithStackStyleTests.swift | 4 ++-- Tests/Tests/ViewTypes/PageControlTests.swift | 2 +- Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift | 2 +- Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift | 2 +- Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift | 2 +- Tests/Tests/ViewTypes/PopoverTests.swift | 2 +- .../ViewTypes/ProgressViewWithCircularStyleTests.swift | 2 +- .../ViewTypes/ProgressViewWithLinearStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ScrollViewTests.swift | 6 +++--- Tests/Tests/ViewTypes/SearchFieldTests.swift | 8 ++++---- Tests/Tests/ViewTypes/SecureFieldTests.swift | 4 ++-- Tests/Tests/ViewTypes/SheetTests.swift | 8 ++++---- Tests/Tests/ViewTypes/SliderTests.swift | 2 +- Tests/Tests/ViewTypes/StepperTests.swift | 2 +- Tests/Tests/ViewTypes/TabViewTests.swift | 4 ++-- Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift | 4 ++-- Tests/Tests/ViewTypes/TableTests.swift | 6 +++--- Tests/Tests/ViewTypes/TextEditorTests.swift | 2 +- Tests/Tests/ViewTypes/TextFieldTests.swift | 4 ++-- .../Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift | 2 +- Tests/Tests/ViewTypes/ToggleTests.swift | 2 +- Tests/Tests/ViewTypes/ToggleWithButtonStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ToggleWithSwitchStyleTests.swift | 2 +- Tests/Tests/ViewTypes/VideoPlayerTests.swift | 2 +- Tests/Tests/ViewTypes/ViewControllerTests.swift | 2 +- Tests/Tests/ViewTypes/ViewTests.swift | 2 +- Tests/Tests/ViewTypes/WebViewTests.swift | 2 +- Tests/Tests/ViewTypes/WindowTests.swift | 2 +- 53 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Tests/Tests/TestUtils.swift b/Tests/Tests/TestUtils.swift index 2cc8329a..4bc3ae39 100644 --- a/Tests/Tests/TestUtils.swift +++ b/Tests/Tests/TestUtils.swift @@ -43,7 +43,7 @@ enum TestUtils { #endif @MainActor -func XCTAssertViewIntrospection( +func assertIntrospection( of type: Entity.Type, @ViewBuilder view: (Spies) -> some View, extraAssertions: ([Entity]) -> Void = { _ in }, diff --git a/Tests/Tests/ViewTypes/ButtonTests.swift b/Tests/Tests/ViewTypes/ButtonTests.swift index f155f258..9811e9ea 100644 --- a/Tests/Tests/ViewTypes/ButtonTests.swift +++ b/Tests/Tests/ViewTypes/ButtonTests.swift @@ -10,7 +10,7 @@ final class ButtonTests: XCTestCase { #endif func testButton() { - XCTAssertViewIntrospection(of: PlatformButton.self) { spies in + assertIntrospection(of: PlatformButton.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ColorPickerTests.swift b/Tests/Tests/ViewTypes/ColorPickerTests.swift index 83abf809..e3ab8eae 100644 --- a/Tests/Tests/ViewTypes/ColorPickerTests.swift +++ b/Tests/Tests/ViewTypes/ColorPickerTests.swift @@ -19,7 +19,7 @@ final class ColorPickerTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformColorPicker.self) { spies in + assertIntrospection(of: PlatformColorPicker.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerTests.swift b/Tests/Tests/ViewTypes/DatePickerTests.swift index 07a2527b..9ecbf2c1 100644 --- a/Tests/Tests/ViewTypes/DatePickerTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerTests.swift @@ -16,7 +16,7 @@ final class DatePickerTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 5) let date2 = Date(timeIntervalSince1970: 10) - XCTAssertViewIntrospection(of: PlatformDatePicker.self) { spies in + assertIntrospection(of: PlatformDatePicker.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift index 237812e9..3d6676f0 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift @@ -21,7 +21,7 @@ final class DatePickerWithCompactStyleTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 5) let date2 = Date(timeIntervalSince1970: 10) - XCTAssertViewIntrospection(of: PlatformDatePickerWithCompactStyle.self) { spies in + assertIntrospection(of: PlatformDatePickerWithCompactStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift index b3227df3..4a6a0e01 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift @@ -14,7 +14,7 @@ final class DatePickerWithFieldStyleTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 5) let date2 = Date(timeIntervalSince1970: 10) - XCTAssertViewIntrospection(of: PlatformDatePickerWithFieldStyle.self) { spies in + assertIntrospection(of: PlatformDatePickerWithFieldStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift index 0fa485b2..38882eba 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift @@ -21,7 +21,7 @@ final class DatePickerWithGraphicalStyleTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 3600 * 24 * 1) let date2 = Date(timeIntervalSince1970: 3600 * 24 * 2) - XCTAssertViewIntrospection(of: PlatformDatePickerWithGraphicalStyle.self) { spies in + assertIntrospection(of: PlatformDatePickerWithGraphicalStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift index a333a94c..4f11b59a 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift @@ -14,7 +14,7 @@ final class DatePickerWithStepperFieldStyleTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 5) let date2 = Date(timeIntervalSince1970: 10) - XCTAssertViewIntrospection(of: PlatformDatePickerWithStepperFieldStyle.self) { spies in + assertIntrospection(of: PlatformDatePickerWithStepperFieldStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift index 1294d80f..6feae90f 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift @@ -14,7 +14,7 @@ final class DatePickerWithWheelStyleTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 5) let date2 = Date(timeIntervalSince1970: 10) - XCTAssertViewIntrospection(of: PlatformDatePickerWithWheelStyle.self) { spies in + assertIntrospection(of: PlatformDatePickerWithWheelStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/FormTests.swift b/Tests/Tests/ViewTypes/FormTests.swift index 35f021eb..d6862d4a 100644 --- a/Tests/Tests/ViewTypes/FormTests.swift +++ b/Tests/Tests/ViewTypes/FormTests.swift @@ -12,7 +12,7 @@ final class FormTests: XCTestCase { #endif func testForm() throws { - XCTAssertViewIntrospection(of: PlatformForm.self) { spies in + assertIntrospection(of: PlatformForm.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift b/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift index 0297fadc..6721acef 100644 --- a/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift +++ b/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift @@ -16,7 +16,7 @@ final class FormWithGroupedStyleTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformFormWithGroupedStyle.self) { spies in + assertIntrospection(of: PlatformFormWithGroupedStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/FullScreenCoverTests.swift b/Tests/Tests/ViewTypes/FullScreenCoverTests.swift index 563d95db..1f27fd49 100644 --- a/Tests/Tests/ViewTypes/FullScreenCoverTests.swift +++ b/Tests/Tests/ViewTypes/FullScreenCoverTests.swift @@ -11,7 +11,7 @@ final class FullScreenCoverTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: UIPresentationController.self) { spies in + assertIntrospection(of: UIPresentationController.self) { spies in let spy0 = spies[0] Text("Root") diff --git a/Tests/Tests/ViewTypes/ListCellTests.swift b/Tests/Tests/ViewTypes/ListCellTests.swift index e95c6f7c..df1d9b93 100644 --- a/Tests/Tests/ViewTypes/ListCellTests.swift +++ b/Tests/Tests/ViewTypes/ListCellTests.swift @@ -11,7 +11,7 @@ final class ListCellTests: XCTestCase { #endif func testListCell() { - XCTAssertViewIntrospection(of: PlatformListCell.self) { spies in + assertIntrospection(of: PlatformListCell.self) { spies in let spy = spies[0] List { @@ -27,7 +27,7 @@ final class ListCellTests: XCTestCase { } func testMaskedListCell() { - XCTAssertViewIntrospection(of: PlatformListCell.self) { spies in + assertIntrospection(of: PlatformListCell.self) { spies in let spy = spies[0] List { diff --git a/Tests/Tests/ViewTypes/ListTests.swift b/Tests/Tests/ViewTypes/ListTests.swift index 8dafe2fd..72f44168 100644 --- a/Tests/Tests/ViewTypes/ListTests.swift +++ b/Tests/Tests/ViewTypes/ListTests.swift @@ -11,7 +11,7 @@ final class ListTests: XCTestCase { #endif func testList() { - XCTAssertViewIntrospection(of: PlatformList.self) { spies in + assertIntrospection(of: PlatformList.self) { spies in let spy0 = spies[0] let spy1 = spies[1] @@ -43,7 +43,7 @@ final class ListTests: XCTestCase { #if !os(macOS) func testNestedList() { - XCTAssertViewIntrospection(of: PlatformList.self) { spies in + assertIntrospection(of: PlatformList.self) { spies in let spy0 = spies[0] let spy1 = spies[1] @@ -69,7 +69,7 @@ final class ListTests: XCTestCase { #endif func testMaskedList() { - XCTAssertViewIntrospection(of: PlatformList.self) { spies in + assertIntrospection(of: PlatformList.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift index 6f28505f..64d1f689 100644 --- a/Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift @@ -15,7 +15,7 @@ final class ListWithBorderedStyleTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformListWithBorderedStyle.self) { spies in + assertIntrospection(of: PlatformListWithBorderedStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift index a0698154..44418069 100644 --- a/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift @@ -10,7 +10,7 @@ final class ListWithGroupedStyleTests: XCTestCase { #endif func testListWithGroupedStyle() { - XCTAssertViewIntrospection(of: PlatformListWithGroupedStyle.self) { spies in + assertIntrospection(of: PlatformListWithGroupedStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift index aad000d9..a24b6e8b 100644 --- a/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift @@ -15,7 +15,7 @@ final class ListWithInsetGroupedStyleTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformListWithInsetGroupedStyle.self) { spies in + assertIntrospection(of: PlatformListWithInsetGroupedStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift b/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift index 22a87262..705f9cc6 100644 --- a/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift @@ -17,7 +17,7 @@ final class ListWithInsetStyleTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformListWithInsetStyle.self) { spies in + assertIntrospection(of: PlatformListWithInsetStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift b/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift index b170db52..9e1c022e 100644 --- a/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift @@ -11,7 +11,7 @@ final class ListWithPlainStyleTests: XCTestCase { #endif func testListWithPlainStyle() { - XCTAssertViewIntrospection(of: PlatformListWithPlainStyle.self) { spies in + assertIntrospection(of: PlatformListWithPlainStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift b/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift index a60bd6f0..bc76bd1e 100644 --- a/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift @@ -17,7 +17,7 @@ final class ListWithSidebarStyleTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformListWithSidebarStyle.self) { spies in + assertIntrospection(of: PlatformListWithSidebarStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/MapTests.swift b/Tests/Tests/ViewTypes/MapTests.swift index 0e5aceef..4840a271 100644 --- a/Tests/Tests/ViewTypes/MapTests.swift +++ b/Tests/Tests/ViewTypes/MapTests.swift @@ -14,7 +14,7 @@ final class MapTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformMap.self) { spies in + assertIntrospection(of: PlatformMap.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift b/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift index f895a182..595f0794 100644 --- a/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift +++ b/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift @@ -21,7 +21,7 @@ final class NavigationSplitViewTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformNavigationSplitView.self) { spies in + assertIntrospection(of: PlatformNavigationSplitView.self) { spies in let spy = spies[0] NavigationSplitView { @@ -53,7 +53,7 @@ final class NavigationSplitViewTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformNavigationSplitView.self) { spies in + assertIntrospection(of: PlatformNavigationSplitView.self) { spies in let spy = spies[0] // NB: columnVisibility is explicitly set here for ancestor introspection to work, because initially on iPad the sidebar is hidden, so the introspection modifier isn't triggered until the user makes the sidebar appear. This is why ancestor introspection is discouraged for most situations and it's opt-in. diff --git a/Tests/Tests/ViewTypes/NavigationStackTests.swift b/Tests/Tests/ViewTypes/NavigationStackTests.swift index a5ffd787..736c9dbe 100644 --- a/Tests/Tests/ViewTypes/NavigationStackTests.swift +++ b/Tests/Tests/ViewTypes/NavigationStackTests.swift @@ -15,7 +15,7 @@ final class NavigationStackTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformNavigationStack.self) { spies in + assertIntrospection(of: PlatformNavigationStack.self) { spies in let spy = spies[0] NavigationStack { @@ -35,7 +35,7 @@ final class NavigationStackTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformNavigationStack.self) { spies in + assertIntrospection(of: PlatformNavigationStack.self) { spies in let spy = spies[0] NavigationStack { diff --git a/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift b/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift index 22ebd547..32ce1bc8 100644 --- a/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift +++ b/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift @@ -13,7 +13,7 @@ final class NavigationViewWithColumnsStyleTests: XCTestCase { #endif func testNavigationViewWithColumnsStyle() { - XCTAssertViewIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in + assertIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in let spy = spies[0] NavigationView { @@ -34,7 +34,7 @@ final class NavigationViewWithColumnsStyleTests: XCTestCase { } func testNavigationViewWithColumnsStyleAsAncestor() { - XCTAssertViewIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in + assertIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in let spy = spies[0] NavigationView { diff --git a/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift b/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift index 3d9de670..0d392531 100644 --- a/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift +++ b/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift @@ -10,7 +10,7 @@ final class NavigationViewWithStackStyleTests: XCTestCase { #endif func testNavigationViewWithStackStyle() { - XCTAssertViewIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in + assertIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in let spy = spies[0] NavigationView { @@ -27,7 +27,7 @@ final class NavigationViewWithStackStyleTests: XCTestCase { } func testNavigationViewWithStackStyleAsAncestor() { - XCTAssertViewIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in + assertIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in let spy = spies[0] NavigationView { diff --git a/Tests/Tests/ViewTypes/PageControlTests.swift b/Tests/Tests/ViewTypes/PageControlTests.swift index 9564e6af..57c08fe1 100644 --- a/Tests/Tests/ViewTypes/PageControlTests.swift +++ b/Tests/Tests/ViewTypes/PageControlTests.swift @@ -15,7 +15,7 @@ final class PageControlTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformPageControl.self) { spies in + assertIntrospection(of: PlatformPageControl.self) { spies in let spy = spies[0] TabView { diff --git a/Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift b/Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift index 8bd0ce65..698a25bf 100644 --- a/Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift +++ b/Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift @@ -10,7 +10,7 @@ final class PickerWithMenuStyleTests: XCTestCase { #endif func testPickerWithMenuStyle() { - XCTAssertViewIntrospection(of: PlatformPickerWithMenuStyle.self) { spies in + assertIntrospection(of: PlatformPickerWithMenuStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift b/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift index 5f85aac5..0a623b24 100644 --- a/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift +++ b/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift @@ -11,7 +11,7 @@ final class PickerWithSegmentedStyleTests: XCTestCase { #endif func testPickerWithSegmentedStyle() { - XCTAssertViewIntrospection(of: PlatformPickerWithSegmentedStyle.self) { spies in + assertIntrospection(of: PlatformPickerWithSegmentedStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift b/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift index 63a9ceb6..c579a69a 100644 --- a/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift +++ b/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift @@ -10,7 +10,7 @@ final class PickerWithWheelStyleTests: XCTestCase { #endif func testPickerWithWheelStyle() { - XCTAssertViewIntrospection(of: PlatformPickerWithWheelStyle.self) { spies in + assertIntrospection(of: PlatformPickerWithWheelStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/PopoverTests.swift b/Tests/Tests/ViewTypes/PopoverTests.swift index 438fa719..7186e283 100644 --- a/Tests/Tests/ViewTypes/PopoverTests.swift +++ b/Tests/Tests/ViewTypes/PopoverTests.swift @@ -6,7 +6,7 @@ import XCTest @MainActor final class PopoverTests: XCTestCase { func testPopover() throws { - XCTAssertViewIntrospection(of: UIPopoverPresentationController.self) { spies in + assertIntrospection(of: UIPopoverPresentationController.self) { spies in let spy0 = spies[0] Text("Root") diff --git a/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift b/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift index 71d18158..ba23b407 100644 --- a/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift +++ b/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift @@ -15,7 +15,7 @@ final class ProgressViewWithCircularStyleTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformProgressViewWithCircularStyle.self) { spies in + assertIntrospection(of: PlatformProgressViewWithCircularStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift b/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift index ef66aaea..b55fc15e 100644 --- a/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift +++ b/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift @@ -15,7 +15,7 @@ final class ProgressViewWithLinearStyleTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformProgressViewWithLinearStyle.self) { spies in + assertIntrospection(of: PlatformProgressViewWithLinearStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ScrollViewTests.swift b/Tests/Tests/ViewTypes/ScrollViewTests.swift index 30d7f223..9b676a16 100644 --- a/Tests/Tests/ViewTypes/ScrollViewTests.swift +++ b/Tests/Tests/ViewTypes/ScrollViewTests.swift @@ -11,7 +11,7 @@ final class ScrollViewTests: XCTestCase { #endif func testScrollView() { - XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in + assertIntrospection(of: PlatformScrollView.self) { spies in let spy0 = spies[0] let spy1 = spies[1] @@ -51,7 +51,7 @@ final class ScrollViewTests: XCTestCase { } func testNestedScrollView() { - XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in + assertIntrospection(of: PlatformScrollView.self) { spies in let spy0 = spies[0] let spy1 = spies[1] @@ -89,7 +89,7 @@ final class ScrollViewTests: XCTestCase { } func testMaskedScrollView() { - XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in + assertIntrospection(of: PlatformScrollView.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/SearchFieldTests.swift b/Tests/Tests/ViewTypes/SearchFieldTests.swift index e48995c1..b3c30c9b 100644 --- a/Tests/Tests/ViewTypes/SearchFieldTests.swift +++ b/Tests/Tests/ViewTypes/SearchFieldTests.swift @@ -15,7 +15,7 @@ final class SearchFieldTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformSearchField.self) { spies in + assertIntrospection(of: PlatformSearchField.self) { spies in let spy = spies[0] NavigationView { @@ -34,7 +34,7 @@ final class SearchFieldTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformSearchField.self) { spies in + assertIntrospection(of: PlatformSearchField.self) { spies in let spy = spies[0] NavigationView { @@ -56,7 +56,7 @@ final class SearchFieldTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformSearchField.self) { spies in + assertIntrospection(of: PlatformSearchField.self) { spies in let spy = spies[0] NavigationView { @@ -81,7 +81,7 @@ final class SearchFieldTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformSearchField.self) { spies in + assertIntrospection(of: PlatformSearchField.self) { spies in let spy = spies[0] NavigationView { diff --git a/Tests/Tests/ViewTypes/SecureFieldTests.swift b/Tests/Tests/ViewTypes/SecureFieldTests.swift index a6127556..4140db48 100644 --- a/Tests/Tests/ViewTypes/SecureFieldTests.swift +++ b/Tests/Tests/ViewTypes/SecureFieldTests.swift @@ -11,7 +11,7 @@ final class SecureFieldTests: XCTestCase { #endif func testSecureField() { - XCTAssertViewIntrospection(of: PlatformSecureField.self) { spies in + assertIntrospection(of: PlatformSecureField.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] @@ -54,7 +54,7 @@ final class SecureFieldTests: XCTestCase { } func testSecureFieldsEmbeddedInList() { - XCTAssertViewIntrospection(of: PlatformSecureField.self) { spies in + assertIntrospection(of: PlatformSecureField.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/SheetTests.swift b/Tests/Tests/ViewTypes/SheetTests.swift index e849bcef..96d85d3a 100644 --- a/Tests/Tests/ViewTypes/SheetTests.swift +++ b/Tests/Tests/ViewTypes/SheetTests.swift @@ -7,7 +7,7 @@ import XCTest final class SheetTests: XCTestCase { #if os(iOS) func testSheet() throws { - XCTAssertViewIntrospection(of: UIPresentationController.self) { spies in + assertIntrospection(of: UIPresentationController.self) { spies in let spy0 = spies[0] Text("Root") @@ -27,7 +27,7 @@ final class SheetTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: UISheetPresentationController.self) { spies in + assertIntrospection(of: UISheetPresentationController.self) { spies in let spy0 = spies[0] Text("Root") @@ -43,7 +43,7 @@ final class SheetTests: XCTestCase { } #elseif os(tvOS) func testSheet() throws { - XCTAssertViewIntrospection(of: UIPresentationController.self) { spies in + assertIntrospection(of: UIPresentationController.self) { spies in let spy0 = spies[0] Text("Root") @@ -59,7 +59,7 @@ final class SheetTests: XCTestCase { } #elseif os(visionOS) func testSheet() throws { - XCTAssertViewIntrospection(of: UIPresentationController.self) { spies in + assertIntrospection(of: UIPresentationController.self) { spies in let spy0 = spies[0] Text("Root") diff --git a/Tests/Tests/ViewTypes/SliderTests.swift b/Tests/Tests/ViewTypes/SliderTests.swift index 64371431..a9170c38 100644 --- a/Tests/Tests/ViewTypes/SliderTests.swift +++ b/Tests/Tests/ViewTypes/SliderTests.swift @@ -12,7 +12,7 @@ final class SliderTests: XCTestCase { #endif func testSlider() { - XCTAssertViewIntrospection(of: PlatformSlider.self) { spies in + assertIntrospection(of: PlatformSlider.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/StepperTests.swift b/Tests/Tests/ViewTypes/StepperTests.swift index 70f2d917..1dd5bf3d 100644 --- a/Tests/Tests/ViewTypes/StepperTests.swift +++ b/Tests/Tests/ViewTypes/StepperTests.swift @@ -12,7 +12,7 @@ final class StepperTests: XCTestCase { #endif func testStepper() { - XCTAssertViewIntrospection(of: PlatformStepper.self) { spies in + assertIntrospection(of: PlatformStepper.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/TabViewTests.swift b/Tests/Tests/ViewTypes/TabViewTests.swift index 1b7a63f6..9b795abb 100644 --- a/Tests/Tests/ViewTypes/TabViewTests.swift +++ b/Tests/Tests/ViewTypes/TabViewTests.swift @@ -16,7 +16,7 @@ final class TabViewTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformTabView.self) { spies in + assertIntrospection(of: PlatformTabView.self) { spies in let spy = spies[0] TabView { @@ -38,7 +38,7 @@ final class TabViewTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformTabView.self) { spies in + assertIntrospection(of: PlatformTabView.self) { spies in let spy = spies[0] TabView { diff --git a/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift b/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift index d012b30a..6be74af4 100644 --- a/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift +++ b/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift @@ -15,7 +15,7 @@ final class TabViewWithPageStyleTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformTabViewWithPageStyle.self) { spies in + assertIntrospection(of: PlatformTabViewWithPageStyle.self) { spies in let spy = spies[0] TabView { @@ -34,7 +34,7 @@ final class TabViewWithPageStyleTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformTabViewWithPageStyle.self) { spies in + assertIntrospection(of: PlatformTabViewWithPageStyle.self) { spies in let spy = spies[0] TabView { diff --git a/Tests/Tests/ViewTypes/TableTests.swift b/Tests/Tests/ViewTypes/TableTests.swift index b0785a66..8add95fe 100644 --- a/Tests/Tests/ViewTypes/TableTests.swift +++ b/Tests/Tests/ViewTypes/TableTests.swift @@ -17,7 +17,7 @@ final class TableTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformTable.self) { spies in + assertIntrospection(of: PlatformTable.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] @@ -52,7 +52,7 @@ final class TableTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformTable.self) { spies in + assertIntrospection(of: PlatformTable.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] @@ -91,7 +91,7 @@ final class TableTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformTable.self) { spies in + assertIntrospection(of: PlatformTable.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/TextEditorTests.swift b/Tests/Tests/ViewTypes/TextEditorTests.swift index 890124db..27a78920 100644 --- a/Tests/Tests/ViewTypes/TextEditorTests.swift +++ b/Tests/Tests/ViewTypes/TextEditorTests.swift @@ -17,7 +17,7 @@ final class TextEditorTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformTextEditor.self) { spies in + assertIntrospection(of: PlatformTextEditor.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/TextFieldTests.swift b/Tests/Tests/ViewTypes/TextFieldTests.swift index dd6232cf..8dd3534a 100644 --- a/Tests/Tests/ViewTypes/TextFieldTests.swift +++ b/Tests/Tests/ViewTypes/TextFieldTests.swift @@ -11,7 +11,7 @@ final class TextFieldTests: XCTestCase { #endif func testTextField() { - XCTAssertViewIntrospection(of: PlatformTextField.self) { spies in + assertIntrospection(of: PlatformTextField.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] @@ -54,7 +54,7 @@ final class TextFieldTests: XCTestCase { } func testTextFieldsEmbeddedInList() { - XCTAssertViewIntrospection(of: PlatformTextField.self) { spies in + assertIntrospection(of: PlatformTextField.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift b/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift index d03140d1..879689c6 100644 --- a/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift +++ b/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift @@ -18,7 +18,7 @@ final class TextFieldWithVerticalAxisTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformTextField.self) { spies in + assertIntrospection(of: PlatformTextField.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ToggleTests.swift b/Tests/Tests/ViewTypes/ToggleTests.swift index cd122502..a0b71e36 100644 --- a/Tests/Tests/ViewTypes/ToggleTests.swift +++ b/Tests/Tests/ViewTypes/ToggleTests.swift @@ -12,7 +12,7 @@ final class ToggleTests: XCTestCase { #endif func testToggle() { - XCTAssertViewIntrospection(of: PlatformToggle.self) { spies in + assertIntrospection(of: PlatformToggle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ToggleWithButtonStyleTests.swift b/Tests/Tests/ViewTypes/ToggleWithButtonStyleTests.swift index 99972faf..c3bd3110 100644 --- a/Tests/Tests/ViewTypes/ToggleWithButtonStyleTests.swift +++ b/Tests/Tests/ViewTypes/ToggleWithButtonStyleTests.swift @@ -15,7 +15,7 @@ final class ToggleWithButtonStyleTests: XCTestCase { throw XCTSkip() } - XCTAssertViewIntrospection(of: PlatformToggleWithButtonStyle.self) { spies in + assertIntrospection(of: PlatformToggleWithButtonStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift b/Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift index 56deb095..2f7f82f3 100644 --- a/Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift +++ b/Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift @@ -10,7 +10,7 @@ final class ToggleWithCheckboxStyleTests: XCTestCase { #endif func testToggleWithCheckboxStyle() throws { - XCTAssertViewIntrospection(of: PlatformToggleWithCheckboxStyle.self) { spies in + assertIntrospection(of: PlatformToggleWithCheckboxStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ToggleWithSwitchStyleTests.swift b/Tests/Tests/ViewTypes/ToggleWithSwitchStyleTests.swift index 2f195621..63153c91 100644 --- a/Tests/Tests/ViewTypes/ToggleWithSwitchStyleTests.swift +++ b/Tests/Tests/ViewTypes/ToggleWithSwitchStyleTests.swift @@ -12,7 +12,7 @@ final class ToggleWithSwitchStyleTests: XCTestCase { #endif func testToggleWithSwitchStyle() { - XCTAssertViewIntrospection(of: PlatformToggleWithSwitchStyle.self) { spies in + assertIntrospection(of: PlatformToggleWithSwitchStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/VideoPlayerTests.swift b/Tests/Tests/ViewTypes/VideoPlayerTests.swift index ef820761..e9b371eb 100644 --- a/Tests/Tests/ViewTypes/VideoPlayerTests.swift +++ b/Tests/Tests/ViewTypes/VideoPlayerTests.swift @@ -22,7 +22,7 @@ final class VideoPlayerTests: XCTestCase { let videoURL1 = URL(string: "https://bit.ly/swswift#2")! let videoURL2 = URL(string: "https://bit.ly/swswift#3")! - XCTAssertViewIntrospection(of: PlatformVideoPlayer.self) { spies in + assertIntrospection(of: PlatformVideoPlayer.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ViewControllerTests.swift b/Tests/Tests/ViewTypes/ViewControllerTests.swift index eae5de8f..92ef0c49 100644 --- a/Tests/Tests/ViewTypes/ViewControllerTests.swift +++ b/Tests/Tests/ViewTypes/ViewControllerTests.swift @@ -6,7 +6,7 @@ import XCTest @MainActor final class ViewControllerTests: XCTestCase { func testViewController() { - XCTAssertViewIntrospection(of: PlatformViewController.self) { spies in + assertIntrospection(of: PlatformViewController.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ViewTests.swift b/Tests/Tests/ViewTypes/ViewTests.swift index 884d444e..f637fb29 100644 --- a/Tests/Tests/ViewTypes/ViewTests.swift +++ b/Tests/Tests/ViewTypes/ViewTests.swift @@ -5,7 +5,7 @@ import XCTest @MainActor final class ViewTests: XCTestCase { func testView() { - XCTAssertViewIntrospection(of: PlatformView.self) { spies in + assertIntrospection(of: PlatformView.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/WebViewTests.swift b/Tests/Tests/ViewTypes/WebViewTests.swift index 98b02785..1f653cd9 100644 --- a/Tests/Tests/ViewTypes/WebViewTests.swift +++ b/Tests/Tests/ViewTypes/WebViewTests.swift @@ -9,7 +9,7 @@ import WebKit struct WebViewTests { @available(iOS 26, tvOS 26, macOS 26, visionOS 26, *) @Test func webView() async throws { - XCTAssertViewIntrospection(of: WKWebView.self) { spies in + assertIntrospection(of: WKWebView.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/WindowTests.swift b/Tests/Tests/ViewTypes/WindowTests.swift index ebe8787f..36063925 100644 --- a/Tests/Tests/ViewTypes/WindowTests.swift +++ b/Tests/Tests/ViewTypes/WindowTests.swift @@ -11,7 +11,7 @@ final class WindowTests: XCTestCase { #endif func testWindow() { - XCTAssertViewIntrospection(of: PlatformWindow.self) { spies in + assertIntrospection(of: PlatformWindow.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] From 4e0172a54fd26fe250e290fefddebf3920aaf4ac Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sun, 15 Jun 2025 21:30:51 +0100 Subject: [PATCH 2/6] WIP --- .github/workflows/ci.yml | 59 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd0888ae..7b06f97b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,21 +47,22 @@ jobs: include: - platform: [iOS, 15] runtime: iOS 15.5 - os: macos-13 - xcode: 15.0.1 + os: macos-14 + xcode: 16.2 install: true - platform: [iOS, 16] runtime: iOS 16.4 - os: macos-13 - xcode: 14.3.1 + os: macos-14 + xcode: 16.2 + install: true - platform: [iOS, 17] runtime: iOS 17.5 os: macos-14 - xcode: 15.4 - - platform: [iOS, 18] - runtime: iOS 18.2 - os: macos-14 xcode: 16.2 + - platform: [iOS, 18] + runtime: iOS 18.5 + os: macos-15 + xcode: 16.4 # - platform: [iOS, 26] # runtime: iOS 26.0 # os: macos-15 @@ -69,21 +70,22 @@ jobs: - platform: [tvOS, 15] runtime: tvOS 15.4 - os: macos-13 - xcode: 15.0.1 + os: macos-14 + xcode: 16.2 install: true - platform: [tvOS, 16] runtime: tvOS 16.4 - os: macos-13 - xcode: 15.0.1 + os: macos-14 + xcode: 16.2 + install: true - platform: [tvOS, 17] runtime: tvOS 17.5 os: macos-14 - xcode: 15.4 - - platform: [tvOS, 18] - runtime: tvOS 18.2 - os: macos-14 xcode: 16.2 + - platform: [tvOS, 18] + runtime: tvOS 18.5 + os: macos-15 + xcode: 16.4 # - platform: [tvOS, 26] # runtime: tvOS 26.0 # os: macos-15 @@ -91,34 +93,31 @@ jobs: - platform: [watchOS, 8] runtime: watchOS 8.5 - os: macos-13 - xcode: 15.0.1 + os: macos-14 + xcode: 16.2 install: true - platform: [watchOS, 9] runtime: watchOS 9.4 - os: macos-13 - xcode: 14.3.1 + os: macos-14 + xcode: 16.2 + install: true - platform: [watchOS, 10] runtime: watchOS 10.5 os: macos-14 - xcode: 15.4 - - platform: [watchOS, 11] - runtime: watchOS 11.2 - os: macos-14 xcode: 16.2 + - platform: [watchOS, 11] + runtime: watchOS 11.5 + os: macos-15 + xcode: 16.4 # - platform: [watchOS, 26] # runtime: watchOS 26.0 # os: macos-15 # xcode: 26.0 - - platform: [macOS, 13] - runtime: macOS 13 - os: macos-13 - xcode: 15.0.1 - platform: [macOS, 14] runtime: macOS 14 os: macos-14 - xcode: 15.4 + xcode: 16.2 - platform: [macOS, 15] runtime: macOS 15 os: macos-15 @@ -131,7 +130,7 @@ jobs: - platform: [visionOS, 1] runtime: visionOS 1.2 os: macos-14 - xcode: 15.4 + xcode: 16.2 - platform: [visionOS, 2] runtime: visionOS 2.5 os: macos-15 From e31a82c9c8da0c00cf89ab6178b3eba990ed4553 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sun, 15 Jun 2025 21:47:12 +0100 Subject: [PATCH 3/6] WIP --- fastlane/Fastfile | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e53d3d21..96d04464 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -67,25 +67,17 @@ lane :test do |options| scheme = options[:scheme].to_s if platform == "macos" - destinations = case version - when 13 - ["platform=macOS"] - else - ["platform=macOS", "platform=macOS,variant=Mac Catalyst"] # TODO: figure out why Catalyst tests fail on macOS 13 - end - for destination in destinations - run_tests( - configuration: configuration, - scheme: scheme, - destination: destination, - catalyst_platform: "macos", - disable_slide_to_type: false, - prelaunch_simulator: false, - ensure_devices_found: true, - force_quit_simulator: false, - disable_concurrent_testing: true, - ) - end + run_tests( + configuration: configuration, + scheme: scheme, + destination: "platform=macOS", + catalyst_platform: "macos", + disable_slide_to_type: false, + prelaunch_simulator: false, + ensure_devices_found: true, + force_quit_simulator: false, + disable_concurrent_testing: true, + ) else unless ["SwiftUIIntrospectTests", "SwiftUIIntrospectUITests"].include?(scheme) raise "Unsupported scheme: #{scheme}" From 82c13b33ca83784422ab546e04150a960d9dda7d Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sun, 15 Jun 2025 21:51:00 +0100 Subject: [PATCH 4/6] WIP --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b06f97b..c9f831e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -171,6 +171,9 @@ jobs: xcrun simctl list xcodebuild -scheme "SwiftUIIntrospect" -showdestinations + - name: Reset Simulators + run: xcrun simctl shutdown all && xcrun simctl erase all + - if: ${{ matrix.platform[0] != 'watchOS' }} name: Build Showcase run: fastlane build platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:Showcase From 878a8f12dc83187d9731cefa61074befd35fd242 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sun, 15 Jun 2025 21:53:53 +0100 Subject: [PATCH 5/6] WIP --- .github/workflows/ci.yml | 3 --- fastlane/Fastfile | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9f831e9..7b06f97b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -171,9 +171,6 @@ jobs: xcrun simctl list xcodebuild -scheme "SwiftUIIntrospect" -showdestinations - - name: Reset Simulators - run: xcrun simctl shutdown all && xcrun simctl erase all - - if: ${{ matrix.platform[0] != 'watchOS' }} name: Build Showcase run: fastlane build platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:Showcase diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 96d04464..9a1187ed 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -89,6 +89,7 @@ lane :test do |options| prelaunch_simulator: true, ensure_devices_found: true, force_quit_simulator: true, + reset_simulator: true, disable_concurrent_testing: true, result_bundle: true, output_directory: Dir.pwd + "/test_output", From 995d1fdde9dbee061cbae96ffa579dc065512e92 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sun, 15 Jun 2025 22:06:33 +0100 Subject: [PATCH 6/6] WIP --- Tests/Tests/TestUtils.swift | 2 +- Tests/Tests/ViewTypes/ButtonTests.swift | 2 +- Tests/Tests/ViewTypes/ColorPickerTests.swift | 2 +- Tests/Tests/ViewTypes/DatePickerTests.swift | 2 +- .../ViewTypes/DatePickerWithCompactFieldStyleTests.swift | 2 +- Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift | 2 +- .../ViewTypes/DatePickerWithGraphicalStyleTests.swift | 2 +- .../ViewTypes/DatePickerWithStepperFieldStyleTests.swift | 2 +- Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift | 2 +- Tests/Tests/ViewTypes/FormTests.swift | 2 +- Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift | 2 +- Tests/Tests/ViewTypes/FullScreenCoverTests.swift | 2 +- Tests/Tests/ViewTypes/ListCellTests.swift | 4 ++-- Tests/Tests/ViewTypes/ListTests.swift | 6 +++--- Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift | 2 +- .../Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift | 2 +- Tests/Tests/ViewTypes/MapTests.swift | 2 +- Tests/Tests/ViewTypes/NavigationSplitViewTests.swift | 4 ++-- Tests/Tests/ViewTypes/NavigationStackTests.swift | 4 ++-- .../ViewTypes/NavigationViewWithColumnsStyleTests.swift | 4 ++-- .../ViewTypes/NavigationViewWithStackStyleTests.swift | 4 ++-- Tests/Tests/ViewTypes/PageControlTests.swift | 2 +- Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift | 2 +- Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift | 2 +- Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift | 2 +- Tests/Tests/ViewTypes/PopoverTests.swift | 2 +- .../ViewTypes/ProgressViewWithCircularStyleTests.swift | 2 +- .../ViewTypes/ProgressViewWithLinearStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ScrollViewTests.swift | 6 +++--- Tests/Tests/ViewTypes/SearchFieldTests.swift | 8 ++++---- Tests/Tests/ViewTypes/SecureFieldTests.swift | 4 ++-- Tests/Tests/ViewTypes/SheetTests.swift | 8 ++++---- Tests/Tests/ViewTypes/SliderTests.swift | 2 +- Tests/Tests/ViewTypes/StepperTests.swift | 2 +- Tests/Tests/ViewTypes/TabViewTests.swift | 4 ++-- Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift | 4 ++-- Tests/Tests/ViewTypes/TableTests.swift | 6 +++--- Tests/Tests/ViewTypes/TextEditorTests.swift | 2 +- Tests/Tests/ViewTypes/TextFieldTests.swift | 4 ++-- .../Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift | 2 +- Tests/Tests/ViewTypes/ToggleTests.swift | 2 +- Tests/Tests/ViewTypes/ToggleWithButtonStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift | 2 +- Tests/Tests/ViewTypes/ToggleWithSwitchStyleTests.swift | 2 +- Tests/Tests/ViewTypes/VideoPlayerTests.swift | 2 +- Tests/Tests/ViewTypes/ViewControllerTests.swift | 2 +- Tests/Tests/ViewTypes/ViewTests.swift | 2 +- Tests/Tests/ViewTypes/WebViewTests.swift | 2 +- Tests/Tests/ViewTypes/WindowTests.swift | 2 +- 53 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Tests/Tests/TestUtils.swift b/Tests/Tests/TestUtils.swift index 4bc3ae39..2cc8329a 100644 --- a/Tests/Tests/TestUtils.swift +++ b/Tests/Tests/TestUtils.swift @@ -43,7 +43,7 @@ enum TestUtils { #endif @MainActor -func assertIntrospection( +func XCTAssertViewIntrospection( of type: Entity.Type, @ViewBuilder view: (Spies) -> some View, extraAssertions: ([Entity]) -> Void = { _ in }, diff --git a/Tests/Tests/ViewTypes/ButtonTests.swift b/Tests/Tests/ViewTypes/ButtonTests.swift index 9811e9ea..f155f258 100644 --- a/Tests/Tests/ViewTypes/ButtonTests.swift +++ b/Tests/Tests/ViewTypes/ButtonTests.swift @@ -10,7 +10,7 @@ final class ButtonTests: XCTestCase { #endif func testButton() { - assertIntrospection(of: PlatformButton.self) { spies in + XCTAssertViewIntrospection(of: PlatformButton.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ColorPickerTests.swift b/Tests/Tests/ViewTypes/ColorPickerTests.swift index e3ab8eae..83abf809 100644 --- a/Tests/Tests/ViewTypes/ColorPickerTests.swift +++ b/Tests/Tests/ViewTypes/ColorPickerTests.swift @@ -19,7 +19,7 @@ final class ColorPickerTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformColorPicker.self) { spies in + XCTAssertViewIntrospection(of: PlatformColorPicker.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerTests.swift b/Tests/Tests/ViewTypes/DatePickerTests.swift index 9ecbf2c1..07a2527b 100644 --- a/Tests/Tests/ViewTypes/DatePickerTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerTests.swift @@ -16,7 +16,7 @@ final class DatePickerTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 5) let date2 = Date(timeIntervalSince1970: 10) - assertIntrospection(of: PlatformDatePicker.self) { spies in + XCTAssertViewIntrospection(of: PlatformDatePicker.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift index 3d6676f0..237812e9 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift @@ -21,7 +21,7 @@ final class DatePickerWithCompactStyleTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 5) let date2 = Date(timeIntervalSince1970: 10) - assertIntrospection(of: PlatformDatePickerWithCompactStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformDatePickerWithCompactStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift index 4a6a0e01..b3227df3 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift @@ -14,7 +14,7 @@ final class DatePickerWithFieldStyleTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 5) let date2 = Date(timeIntervalSince1970: 10) - assertIntrospection(of: PlatformDatePickerWithFieldStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformDatePickerWithFieldStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift index 38882eba..0fa485b2 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift @@ -21,7 +21,7 @@ final class DatePickerWithGraphicalStyleTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 3600 * 24 * 1) let date2 = Date(timeIntervalSince1970: 3600 * 24 * 2) - assertIntrospection(of: PlatformDatePickerWithGraphicalStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformDatePickerWithGraphicalStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift index 4f11b59a..a333a94c 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift @@ -14,7 +14,7 @@ final class DatePickerWithStepperFieldStyleTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 5) let date2 = Date(timeIntervalSince1970: 10) - assertIntrospection(of: PlatformDatePickerWithStepperFieldStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformDatePickerWithStepperFieldStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift index 6feae90f..1294d80f 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift @@ -14,7 +14,7 @@ final class DatePickerWithWheelStyleTests: XCTestCase { let date1 = Date(timeIntervalSince1970: 5) let date2 = Date(timeIntervalSince1970: 10) - assertIntrospection(of: PlatformDatePickerWithWheelStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformDatePickerWithWheelStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/FormTests.swift b/Tests/Tests/ViewTypes/FormTests.swift index d6862d4a..35f021eb 100644 --- a/Tests/Tests/ViewTypes/FormTests.swift +++ b/Tests/Tests/ViewTypes/FormTests.swift @@ -12,7 +12,7 @@ final class FormTests: XCTestCase { #endif func testForm() throws { - assertIntrospection(of: PlatformForm.self) { spies in + XCTAssertViewIntrospection(of: PlatformForm.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift b/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift index 6721acef..0297fadc 100644 --- a/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift +++ b/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift @@ -16,7 +16,7 @@ final class FormWithGroupedStyleTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformFormWithGroupedStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformFormWithGroupedStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/FullScreenCoverTests.swift b/Tests/Tests/ViewTypes/FullScreenCoverTests.swift index 1f27fd49..563d95db 100644 --- a/Tests/Tests/ViewTypes/FullScreenCoverTests.swift +++ b/Tests/Tests/ViewTypes/FullScreenCoverTests.swift @@ -11,7 +11,7 @@ final class FullScreenCoverTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: UIPresentationController.self) { spies in + XCTAssertViewIntrospection(of: UIPresentationController.self) { spies in let spy0 = spies[0] Text("Root") diff --git a/Tests/Tests/ViewTypes/ListCellTests.swift b/Tests/Tests/ViewTypes/ListCellTests.swift index df1d9b93..e95c6f7c 100644 --- a/Tests/Tests/ViewTypes/ListCellTests.swift +++ b/Tests/Tests/ViewTypes/ListCellTests.swift @@ -11,7 +11,7 @@ final class ListCellTests: XCTestCase { #endif func testListCell() { - assertIntrospection(of: PlatformListCell.self) { spies in + XCTAssertViewIntrospection(of: PlatformListCell.self) { spies in let spy = spies[0] List { @@ -27,7 +27,7 @@ final class ListCellTests: XCTestCase { } func testMaskedListCell() { - assertIntrospection(of: PlatformListCell.self) { spies in + XCTAssertViewIntrospection(of: PlatformListCell.self) { spies in let spy = spies[0] List { diff --git a/Tests/Tests/ViewTypes/ListTests.swift b/Tests/Tests/ViewTypes/ListTests.swift index 72f44168..8dafe2fd 100644 --- a/Tests/Tests/ViewTypes/ListTests.swift +++ b/Tests/Tests/ViewTypes/ListTests.swift @@ -11,7 +11,7 @@ final class ListTests: XCTestCase { #endif func testList() { - assertIntrospection(of: PlatformList.self) { spies in + XCTAssertViewIntrospection(of: PlatformList.self) { spies in let spy0 = spies[0] let spy1 = spies[1] @@ -43,7 +43,7 @@ final class ListTests: XCTestCase { #if !os(macOS) func testNestedList() { - assertIntrospection(of: PlatformList.self) { spies in + XCTAssertViewIntrospection(of: PlatformList.self) { spies in let spy0 = spies[0] let spy1 = spies[1] @@ -69,7 +69,7 @@ final class ListTests: XCTestCase { #endif func testMaskedList() { - assertIntrospection(of: PlatformList.self) { spies in + XCTAssertViewIntrospection(of: PlatformList.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift index 64d1f689..6f28505f 100644 --- a/Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift @@ -15,7 +15,7 @@ final class ListWithBorderedStyleTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformListWithBorderedStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformListWithBorderedStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift index 44418069..a0698154 100644 --- a/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift @@ -10,7 +10,7 @@ final class ListWithGroupedStyleTests: XCTestCase { #endif func testListWithGroupedStyle() { - assertIntrospection(of: PlatformListWithGroupedStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformListWithGroupedStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift index a24b6e8b..aad000d9 100644 --- a/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift @@ -15,7 +15,7 @@ final class ListWithInsetGroupedStyleTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformListWithInsetGroupedStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformListWithInsetGroupedStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift b/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift index 705f9cc6..22a87262 100644 --- a/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift @@ -17,7 +17,7 @@ final class ListWithInsetStyleTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformListWithInsetStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformListWithInsetStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift b/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift index 9e1c022e..b170db52 100644 --- a/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift @@ -11,7 +11,7 @@ final class ListWithPlainStyleTests: XCTestCase { #endif func testListWithPlainStyle() { - assertIntrospection(of: PlatformListWithPlainStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformListWithPlainStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift b/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift index bc76bd1e..a60bd6f0 100644 --- a/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift @@ -17,7 +17,7 @@ final class ListWithSidebarStyleTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformListWithSidebarStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformListWithSidebarStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/MapTests.swift b/Tests/Tests/ViewTypes/MapTests.swift index 4840a271..0e5aceef 100644 --- a/Tests/Tests/ViewTypes/MapTests.swift +++ b/Tests/Tests/ViewTypes/MapTests.swift @@ -14,7 +14,7 @@ final class MapTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformMap.self) { spies in + XCTAssertViewIntrospection(of: PlatformMap.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift b/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift index 595f0794..f895a182 100644 --- a/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift +++ b/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift @@ -21,7 +21,7 @@ final class NavigationSplitViewTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformNavigationSplitView.self) { spies in + XCTAssertViewIntrospection(of: PlatformNavigationSplitView.self) { spies in let spy = spies[0] NavigationSplitView { @@ -53,7 +53,7 @@ final class NavigationSplitViewTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformNavigationSplitView.self) { spies in + XCTAssertViewIntrospection(of: PlatformNavigationSplitView.self) { spies in let spy = spies[0] // NB: columnVisibility is explicitly set here for ancestor introspection to work, because initially on iPad the sidebar is hidden, so the introspection modifier isn't triggered until the user makes the sidebar appear. This is why ancestor introspection is discouraged for most situations and it's opt-in. diff --git a/Tests/Tests/ViewTypes/NavigationStackTests.swift b/Tests/Tests/ViewTypes/NavigationStackTests.swift index 736c9dbe..a5ffd787 100644 --- a/Tests/Tests/ViewTypes/NavigationStackTests.swift +++ b/Tests/Tests/ViewTypes/NavigationStackTests.swift @@ -15,7 +15,7 @@ final class NavigationStackTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformNavigationStack.self) { spies in + XCTAssertViewIntrospection(of: PlatformNavigationStack.self) { spies in let spy = spies[0] NavigationStack { @@ -35,7 +35,7 @@ final class NavigationStackTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformNavigationStack.self) { spies in + XCTAssertViewIntrospection(of: PlatformNavigationStack.self) { spies in let spy = spies[0] NavigationStack { diff --git a/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift b/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift index 32ce1bc8..22ebd547 100644 --- a/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift +++ b/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift @@ -13,7 +13,7 @@ final class NavigationViewWithColumnsStyleTests: XCTestCase { #endif func testNavigationViewWithColumnsStyle() { - assertIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in let spy = spies[0] NavigationView { @@ -34,7 +34,7 @@ final class NavigationViewWithColumnsStyleTests: XCTestCase { } func testNavigationViewWithColumnsStyleAsAncestor() { - assertIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in let spy = spies[0] NavigationView { diff --git a/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift b/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift index 0d392531..3d9de670 100644 --- a/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift +++ b/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift @@ -10,7 +10,7 @@ final class NavigationViewWithStackStyleTests: XCTestCase { #endif func testNavigationViewWithStackStyle() { - assertIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in let spy = spies[0] NavigationView { @@ -27,7 +27,7 @@ final class NavigationViewWithStackStyleTests: XCTestCase { } func testNavigationViewWithStackStyleAsAncestor() { - assertIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in let spy = spies[0] NavigationView { diff --git a/Tests/Tests/ViewTypes/PageControlTests.swift b/Tests/Tests/ViewTypes/PageControlTests.swift index 57c08fe1..9564e6af 100644 --- a/Tests/Tests/ViewTypes/PageControlTests.swift +++ b/Tests/Tests/ViewTypes/PageControlTests.swift @@ -15,7 +15,7 @@ final class PageControlTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformPageControl.self) { spies in + XCTAssertViewIntrospection(of: PlatformPageControl.self) { spies in let spy = spies[0] TabView { diff --git a/Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift b/Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift index 698a25bf..8bd0ce65 100644 --- a/Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift +++ b/Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift @@ -10,7 +10,7 @@ final class PickerWithMenuStyleTests: XCTestCase { #endif func testPickerWithMenuStyle() { - assertIntrospection(of: PlatformPickerWithMenuStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformPickerWithMenuStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift b/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift index 0a623b24..5f85aac5 100644 --- a/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift +++ b/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift @@ -11,7 +11,7 @@ final class PickerWithSegmentedStyleTests: XCTestCase { #endif func testPickerWithSegmentedStyle() { - assertIntrospection(of: PlatformPickerWithSegmentedStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformPickerWithSegmentedStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift b/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift index c579a69a..63a9ceb6 100644 --- a/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift +++ b/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift @@ -10,7 +10,7 @@ final class PickerWithWheelStyleTests: XCTestCase { #endif func testPickerWithWheelStyle() { - assertIntrospection(of: PlatformPickerWithWheelStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformPickerWithWheelStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/PopoverTests.swift b/Tests/Tests/ViewTypes/PopoverTests.swift index 7186e283..438fa719 100644 --- a/Tests/Tests/ViewTypes/PopoverTests.swift +++ b/Tests/Tests/ViewTypes/PopoverTests.swift @@ -6,7 +6,7 @@ import XCTest @MainActor final class PopoverTests: XCTestCase { func testPopover() throws { - assertIntrospection(of: UIPopoverPresentationController.self) { spies in + XCTAssertViewIntrospection(of: UIPopoverPresentationController.self) { spies in let spy0 = spies[0] Text("Root") diff --git a/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift b/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift index ba23b407..71d18158 100644 --- a/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift +++ b/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift @@ -15,7 +15,7 @@ final class ProgressViewWithCircularStyleTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformProgressViewWithCircularStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformProgressViewWithCircularStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift b/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift index b55fc15e..ef66aaea 100644 --- a/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift +++ b/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift @@ -15,7 +15,7 @@ final class ProgressViewWithLinearStyleTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformProgressViewWithLinearStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformProgressViewWithLinearStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ScrollViewTests.swift b/Tests/Tests/ViewTypes/ScrollViewTests.swift index 9b676a16..30d7f223 100644 --- a/Tests/Tests/ViewTypes/ScrollViewTests.swift +++ b/Tests/Tests/ViewTypes/ScrollViewTests.swift @@ -11,7 +11,7 @@ final class ScrollViewTests: XCTestCase { #endif func testScrollView() { - assertIntrospection(of: PlatformScrollView.self) { spies in + XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in let spy0 = spies[0] let spy1 = spies[1] @@ -51,7 +51,7 @@ final class ScrollViewTests: XCTestCase { } func testNestedScrollView() { - assertIntrospection(of: PlatformScrollView.self) { spies in + XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in let spy0 = spies[0] let spy1 = spies[1] @@ -89,7 +89,7 @@ final class ScrollViewTests: XCTestCase { } func testMaskedScrollView() { - assertIntrospection(of: PlatformScrollView.self) { spies in + XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in let spy0 = spies[0] let spy1 = spies[1] diff --git a/Tests/Tests/ViewTypes/SearchFieldTests.swift b/Tests/Tests/ViewTypes/SearchFieldTests.swift index b3c30c9b..e48995c1 100644 --- a/Tests/Tests/ViewTypes/SearchFieldTests.swift +++ b/Tests/Tests/ViewTypes/SearchFieldTests.swift @@ -15,7 +15,7 @@ final class SearchFieldTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformSearchField.self) { spies in + XCTAssertViewIntrospection(of: PlatformSearchField.self) { spies in let spy = spies[0] NavigationView { @@ -34,7 +34,7 @@ final class SearchFieldTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformSearchField.self) { spies in + XCTAssertViewIntrospection(of: PlatformSearchField.self) { spies in let spy = spies[0] NavigationView { @@ -56,7 +56,7 @@ final class SearchFieldTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformSearchField.self) { spies in + XCTAssertViewIntrospection(of: PlatformSearchField.self) { spies in let spy = spies[0] NavigationView { @@ -81,7 +81,7 @@ final class SearchFieldTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformSearchField.self) { spies in + XCTAssertViewIntrospection(of: PlatformSearchField.self) { spies in let spy = spies[0] NavigationView { diff --git a/Tests/Tests/ViewTypes/SecureFieldTests.swift b/Tests/Tests/ViewTypes/SecureFieldTests.swift index 4140db48..a6127556 100644 --- a/Tests/Tests/ViewTypes/SecureFieldTests.swift +++ b/Tests/Tests/ViewTypes/SecureFieldTests.swift @@ -11,7 +11,7 @@ final class SecureFieldTests: XCTestCase { #endif func testSecureField() { - assertIntrospection(of: PlatformSecureField.self) { spies in + XCTAssertViewIntrospection(of: PlatformSecureField.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] @@ -54,7 +54,7 @@ final class SecureFieldTests: XCTestCase { } func testSecureFieldsEmbeddedInList() { - assertIntrospection(of: PlatformSecureField.self) { spies in + XCTAssertViewIntrospection(of: PlatformSecureField.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/SheetTests.swift b/Tests/Tests/ViewTypes/SheetTests.swift index 96d85d3a..e849bcef 100644 --- a/Tests/Tests/ViewTypes/SheetTests.swift +++ b/Tests/Tests/ViewTypes/SheetTests.swift @@ -7,7 +7,7 @@ import XCTest final class SheetTests: XCTestCase { #if os(iOS) func testSheet() throws { - assertIntrospection(of: UIPresentationController.self) { spies in + XCTAssertViewIntrospection(of: UIPresentationController.self) { spies in let spy0 = spies[0] Text("Root") @@ -27,7 +27,7 @@ final class SheetTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: UISheetPresentationController.self) { spies in + XCTAssertViewIntrospection(of: UISheetPresentationController.self) { spies in let spy0 = spies[0] Text("Root") @@ -43,7 +43,7 @@ final class SheetTests: XCTestCase { } #elseif os(tvOS) func testSheet() throws { - assertIntrospection(of: UIPresentationController.self) { spies in + XCTAssertViewIntrospection(of: UIPresentationController.self) { spies in let spy0 = spies[0] Text("Root") @@ -59,7 +59,7 @@ final class SheetTests: XCTestCase { } #elseif os(visionOS) func testSheet() throws { - assertIntrospection(of: UIPresentationController.self) { spies in + XCTAssertViewIntrospection(of: UIPresentationController.self) { spies in let spy0 = spies[0] Text("Root") diff --git a/Tests/Tests/ViewTypes/SliderTests.swift b/Tests/Tests/ViewTypes/SliderTests.swift index a9170c38..64371431 100644 --- a/Tests/Tests/ViewTypes/SliderTests.swift +++ b/Tests/Tests/ViewTypes/SliderTests.swift @@ -12,7 +12,7 @@ final class SliderTests: XCTestCase { #endif func testSlider() { - assertIntrospection(of: PlatformSlider.self) { spies in + XCTAssertViewIntrospection(of: PlatformSlider.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/StepperTests.swift b/Tests/Tests/ViewTypes/StepperTests.swift index 1dd5bf3d..70f2d917 100644 --- a/Tests/Tests/ViewTypes/StepperTests.swift +++ b/Tests/Tests/ViewTypes/StepperTests.swift @@ -12,7 +12,7 @@ final class StepperTests: XCTestCase { #endif func testStepper() { - assertIntrospection(of: PlatformStepper.self) { spies in + XCTAssertViewIntrospection(of: PlatformStepper.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/TabViewTests.swift b/Tests/Tests/ViewTypes/TabViewTests.swift index 9b795abb..1b7a63f6 100644 --- a/Tests/Tests/ViewTypes/TabViewTests.swift +++ b/Tests/Tests/ViewTypes/TabViewTests.swift @@ -16,7 +16,7 @@ final class TabViewTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformTabView.self) { spies in + XCTAssertViewIntrospection(of: PlatformTabView.self) { spies in let spy = spies[0] TabView { @@ -38,7 +38,7 @@ final class TabViewTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformTabView.self) { spies in + XCTAssertViewIntrospection(of: PlatformTabView.self) { spies in let spy = spies[0] TabView { diff --git a/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift b/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift index 6be74af4..d012b30a 100644 --- a/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift +++ b/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift @@ -15,7 +15,7 @@ final class TabViewWithPageStyleTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformTabViewWithPageStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformTabViewWithPageStyle.self) { spies in let spy = spies[0] TabView { @@ -34,7 +34,7 @@ final class TabViewWithPageStyleTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformTabViewWithPageStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformTabViewWithPageStyle.self) { spies in let spy = spies[0] TabView { diff --git a/Tests/Tests/ViewTypes/TableTests.swift b/Tests/Tests/ViewTypes/TableTests.swift index 8add95fe..b0785a66 100644 --- a/Tests/Tests/ViewTypes/TableTests.swift +++ b/Tests/Tests/ViewTypes/TableTests.swift @@ -17,7 +17,7 @@ final class TableTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformTable.self) { spies in + XCTAssertViewIntrospection(of: PlatformTable.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] @@ -52,7 +52,7 @@ final class TableTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformTable.self) { spies in + XCTAssertViewIntrospection(of: PlatformTable.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] @@ -91,7 +91,7 @@ final class TableTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformTable.self) { spies in + XCTAssertViewIntrospection(of: PlatformTable.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/TextEditorTests.swift b/Tests/Tests/ViewTypes/TextEditorTests.swift index 27a78920..890124db 100644 --- a/Tests/Tests/ViewTypes/TextEditorTests.swift +++ b/Tests/Tests/ViewTypes/TextEditorTests.swift @@ -17,7 +17,7 @@ final class TextEditorTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformTextEditor.self) { spies in + XCTAssertViewIntrospection(of: PlatformTextEditor.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/TextFieldTests.swift b/Tests/Tests/ViewTypes/TextFieldTests.swift index 8dd3534a..dd6232cf 100644 --- a/Tests/Tests/ViewTypes/TextFieldTests.swift +++ b/Tests/Tests/ViewTypes/TextFieldTests.swift @@ -11,7 +11,7 @@ final class TextFieldTests: XCTestCase { #endif func testTextField() { - assertIntrospection(of: PlatformTextField.self) { spies in + XCTAssertViewIntrospection(of: PlatformTextField.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] @@ -54,7 +54,7 @@ final class TextFieldTests: XCTestCase { } func testTextFieldsEmbeddedInList() { - assertIntrospection(of: PlatformTextField.self) { spies in + XCTAssertViewIntrospection(of: PlatformTextField.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift b/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift index 879689c6..d03140d1 100644 --- a/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift +++ b/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift @@ -18,7 +18,7 @@ final class TextFieldWithVerticalAxisTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformTextField.self) { spies in + XCTAssertViewIntrospection(of: PlatformTextField.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ToggleTests.swift b/Tests/Tests/ViewTypes/ToggleTests.swift index a0b71e36..cd122502 100644 --- a/Tests/Tests/ViewTypes/ToggleTests.swift +++ b/Tests/Tests/ViewTypes/ToggleTests.swift @@ -12,7 +12,7 @@ final class ToggleTests: XCTestCase { #endif func testToggle() { - assertIntrospection(of: PlatformToggle.self) { spies in + XCTAssertViewIntrospection(of: PlatformToggle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ToggleWithButtonStyleTests.swift b/Tests/Tests/ViewTypes/ToggleWithButtonStyleTests.swift index c3bd3110..99972faf 100644 --- a/Tests/Tests/ViewTypes/ToggleWithButtonStyleTests.swift +++ b/Tests/Tests/ViewTypes/ToggleWithButtonStyleTests.swift @@ -15,7 +15,7 @@ final class ToggleWithButtonStyleTests: XCTestCase { throw XCTSkip() } - assertIntrospection(of: PlatformToggleWithButtonStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformToggleWithButtonStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift b/Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift index 2f7f82f3..56deb095 100644 --- a/Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift +++ b/Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift @@ -10,7 +10,7 @@ final class ToggleWithCheckboxStyleTests: XCTestCase { #endif func testToggleWithCheckboxStyle() throws { - assertIntrospection(of: PlatformToggleWithCheckboxStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformToggleWithCheckboxStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ToggleWithSwitchStyleTests.swift b/Tests/Tests/ViewTypes/ToggleWithSwitchStyleTests.swift index 63153c91..2f195621 100644 --- a/Tests/Tests/ViewTypes/ToggleWithSwitchStyleTests.swift +++ b/Tests/Tests/ViewTypes/ToggleWithSwitchStyleTests.swift @@ -12,7 +12,7 @@ final class ToggleWithSwitchStyleTests: XCTestCase { #endif func testToggleWithSwitchStyle() { - assertIntrospection(of: PlatformToggleWithSwitchStyle.self) { spies in + XCTAssertViewIntrospection(of: PlatformToggleWithSwitchStyle.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/VideoPlayerTests.swift b/Tests/Tests/ViewTypes/VideoPlayerTests.swift index e9b371eb..ef820761 100644 --- a/Tests/Tests/ViewTypes/VideoPlayerTests.swift +++ b/Tests/Tests/ViewTypes/VideoPlayerTests.swift @@ -22,7 +22,7 @@ final class VideoPlayerTests: XCTestCase { let videoURL1 = URL(string: "https://bit.ly/swswift#2")! let videoURL2 = URL(string: "https://bit.ly/swswift#3")! - assertIntrospection(of: PlatformVideoPlayer.self) { spies in + XCTAssertViewIntrospection(of: PlatformVideoPlayer.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ViewControllerTests.swift b/Tests/Tests/ViewTypes/ViewControllerTests.swift index 92ef0c49..eae5de8f 100644 --- a/Tests/Tests/ViewTypes/ViewControllerTests.swift +++ b/Tests/Tests/ViewTypes/ViewControllerTests.swift @@ -6,7 +6,7 @@ import XCTest @MainActor final class ViewControllerTests: XCTestCase { func testViewController() { - assertIntrospection(of: PlatformViewController.self) { spies in + XCTAssertViewIntrospection(of: PlatformViewController.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/ViewTests.swift b/Tests/Tests/ViewTypes/ViewTests.swift index f637fb29..884d444e 100644 --- a/Tests/Tests/ViewTypes/ViewTests.swift +++ b/Tests/Tests/ViewTypes/ViewTests.swift @@ -5,7 +5,7 @@ import XCTest @MainActor final class ViewTests: XCTestCase { func testView() { - assertIntrospection(of: PlatformView.self) { spies in + XCTAssertViewIntrospection(of: PlatformView.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/WebViewTests.swift b/Tests/Tests/ViewTypes/WebViewTests.swift index 1f653cd9..98b02785 100644 --- a/Tests/Tests/ViewTypes/WebViewTests.swift +++ b/Tests/Tests/ViewTypes/WebViewTests.swift @@ -9,7 +9,7 @@ import WebKit struct WebViewTests { @available(iOS 26, tvOS 26, macOS 26, visionOS 26, *) @Test func webView() async throws { - assertIntrospection(of: WKWebView.self) { spies in + XCTAssertViewIntrospection(of: WKWebView.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2] diff --git a/Tests/Tests/ViewTypes/WindowTests.swift b/Tests/Tests/ViewTypes/WindowTests.swift index 36063925..ebe8787f 100644 --- a/Tests/Tests/ViewTypes/WindowTests.swift +++ b/Tests/Tests/ViewTypes/WindowTests.swift @@ -11,7 +11,7 @@ final class WindowTests: XCTestCase { #endif func testWindow() { - assertIntrospection(of: PlatformWindow.self) { spies in + XCTAssertViewIntrospection(of: PlatformWindow.self) { spies in let spy0 = spies[0] let spy1 = spies[1] let spy2 = spies[2]