Skip to content

Commit bcec0d6

Browse files
davdromandavdroman
committed
Revert "[Swift 6] Update Tests for Swift 6"
This reverts commit b2f97b7.
1 parent ef13c87 commit bcec0d6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+0
-80
lines changed

‎Tests/Tests/PlatformVersionTests.swift

-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import XCTest
33

44
final class PlatformVersionTests: XCTestCase {
5-
@MainActor
65
func test_iOS_isCurrent() {
76
#if os(iOS)
87
if #available(iOS 17, *) {
@@ -45,7 +44,6 @@ final class PlatformVersionTests: XCTestCase {
4544
#endif
4645
}
4746

48-
@MainActor
4947
func test_iOS_isCurrentOrPast() {
5048
#if os(iOS)
5149
if #available(iOS 17, *) {
@@ -88,7 +86,6 @@ final class PlatformVersionTests: XCTestCase {
8886
#endif
8987
}
9088

91-
@MainActor
9289
func test_macOS_isCurrent() {
9390
#if os(macOS)
9491
if #available(macOS 14, *) {
@@ -131,7 +128,6 @@ final class PlatformVersionTests: XCTestCase {
131128
#endif
132129
}
133130

134-
@MainActor
135131
func test_macOS_isCurrentOrPast() {
136132
#if os(macOS)
137133
if #available(macOS 14, *) {
@@ -174,7 +170,6 @@ final class PlatformVersionTests: XCTestCase {
174170
#endif
175171
}
176172

177-
@MainActor
178173
func test_tvOS_isCurrent() {
179174
#if os(tvOS)
180175
if #available(tvOS 17, *) {
@@ -217,7 +212,6 @@ final class PlatformVersionTests: XCTestCase {
217212
#endif
218213
}
219214

220-
@MainActor
221215
func test_tvOS_isCurrentOrPast() {
222216
#if os(tvOS)
223217
if #available(tvOS 17, *) {

‎Tests/Tests/ViewTypes/ButtonTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ final class ButtonTests: XCTestCase {
99
typealias PlatformButton = NSButton
1010
#endif
1111

12-
@MainActor
1312
func testButton() {
1413
XCTAssertViewIntrospection(of: PlatformButton.self) { spies in
1514
let spy0 = spies[0]

‎Tests/Tests/ViewTypes/ColorPickerTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ final class ColorPickerTests: XCTestCase {
1414
typealias PlatformColorPicker = NSColorWell
1515
#endif
1616

17-
@MainActor
1817
func testColorPicker() throws {
1918
guard #available(iOS 14, macOS 11, *) else {
2019
throw XCTSkip()

‎Tests/Tests/ViewTypes/DatePickerTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ final class DatePickerTests: XCTestCase {
1111
typealias PlatformDatePicker = NSDatePicker
1212
#endif
1313

14-
@MainActor
1514
func testDatePicker() {
1615
let date0 = Date(timeIntervalSince1970: 0)
1716
let date1 = Date(timeIntervalSince1970: 5)

‎Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ final class DatePickerWithCompactStyleTests: XCTestCase {
1212
typealias PlatformDatePickerWithCompactStyle = NSDatePicker
1313
#endif
1414

15-
@MainActor
1615
func testDatePickerWithCompactStyle() throws {
1716
guard #available(iOS 14, macOS 10.15.4, *) else {
1817
throw XCTSkip()

‎Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ final class DatePickerWithFieldStyleTests: XCTestCase {
99
typealias PlatformDatePickerWithFieldStyle = NSDatePicker
1010
#endif
1111

12-
@MainActor
1312
func testDatePickerWithFieldStyle() {
1413
let date0 = Date(timeIntervalSince1970: 0)
1514
let date1 = Date(timeIntervalSince1970: 5)

‎Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ final class DatePickerWithGraphicalStyleTests: XCTestCase {
1212
typealias PlatformDatePickerWithGraphicalStyle = NSDatePicker
1313
#endif
1414

15-
@MainActor
1615
func testDatePickerWithGraphicalStyle() throws {
1716
guard #available(iOS 14, *) else {
1817
throw XCTSkip()

‎Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ final class DatePickerWithStepperFieldStyleTests: XCTestCase {
99
typealias PlatformDatePickerWithStepperFieldStyle = NSDatePicker
1010
#endif
1111

12-
@MainActor
1312
func testDatePickerWithStepperFieldStyle() {
1413
let date0 = Date(timeIntervalSince1970: 0)
1514
let date1 = Date(timeIntervalSince1970: 5)

‎Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ final class DatePickerWithWheelStyleTests: XCTestCase {
99
typealias PlatformDatePickerWithWheelStyle = UIDatePicker
1010
#endif
1111

12-
@MainActor
1312
func testDatePickerWithWheelStyle() {
1413
let date0 = Date(timeIntervalSince1970: 0)
1514
let date1 = Date(timeIntervalSince1970: 5)

‎Tests/Tests/ViewTypes/FormTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ final class FormTests: XCTestCase {
1111
typealias PlatformForm = NSScrollView
1212
#endif
1313

14-
@MainActor
1514
func testForm() throws {
1615
XCTAssertViewIntrospection(of: PlatformForm.self) { spies in
1716
let spy0 = spies[0]

‎Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ final class FormWithGroupedStyleTests: XCTestCase {
1111
typealias PlatformFormWithGroupedStyle = NSScrollView
1212
#endif
1313

14-
@MainActor
1514
func testFormWithGroupedStyle() throws {
1615
guard #available(iOS 16, tvOS 16, macOS 13, *) else {
1716
throw XCTSkip()

‎Tests/Tests/ViewTypes/FullScreenCoverTests.swift

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import XCTest
66
@available(iOS 14, tvOS 14, *)
77
@MainActor
88
final class FullScreenCoverTests: XCTestCase {
9-
10-
@MainActor
119
func testPresentationAsFullScreenCover() throws {
1210
guard #available(iOS 14, tvOS 14, *) else {
1311
throw XCTSkip()

‎Tests/Tests/ViewTypes/ListCellTests.swift

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class ListCellTests: XCTestCase {
1010
typealias PlatformListCell = NSTableCellView
1111
#endif
1212

13-
@MainActor
1413
func testListCell() {
1514
XCTAssertViewIntrospection(of: PlatformListCell.self) { spies in
1615
let spy = spies[0]
@@ -27,7 +26,6 @@ final class ListCellTests: XCTestCase {
2726
}
2827
}
2928

30-
@MainActor
3129
func testMaskedListCell() {
3230
XCTAssertViewIntrospection(of: PlatformListCell.self) { spies in
3331
let spy = spies[0]

‎Tests/Tests/ViewTypes/ListTests.swift

-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class ListTests: XCTestCase {
1010
typealias PlatformList = NSTableView
1111
#endif
1212

13-
@MainActor
1413
func testList() {
1514
XCTAssertViewIntrospection(of: PlatformList.self) { spies in
1615
let spy0 = spies[0]
@@ -43,7 +42,6 @@ final class ListTests: XCTestCase {
4342
}
4443

4544
#if !os(macOS)
46-
@MainActor
4745
func testNestedList() {
4846
XCTAssertViewIntrospection(of: PlatformList.self) { spies in
4947
let spy0 = spies[0]
@@ -70,7 +68,6 @@ final class ListTests: XCTestCase {
7068
}
7169
#endif
7270

73-
@MainActor
7471
func testMaskedList() {
7572
XCTAssertViewIntrospection(of: PlatformList.self) { spies in
7673
let spy0 = spies[0]

‎Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class ListWithBorderedStyleTests: XCTestCase {
1010
typealias PlatformListWithBorderedStyle = NSTableView
1111
#endif
1212

13-
@MainActor
1413
func testListWithBorderedStyle() throws {
1514
guard #available(macOS 12, *) else {
1615
throw XCTSkip()

‎Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ final class ListWithGroupedStyleTests: XCTestCase {
99
typealias PlatformListWithGroupedStyle = UIScrollView // covers both UITableView and UICollectionView
1010
#endif
1111

12-
@MainActor
1312
func testListWithGroupedStyle() {
1413
XCTAssertViewIntrospection(of: PlatformListWithGroupedStyle.self) { spies in
1514
let spy0 = spies[0]

‎Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class ListWithInsetGroupedStyleTests: XCTestCase {
1010
typealias PlatformListWithInsetGroupedStyle = UIScrollView // covers both UITableView and UICollectionView
1111
#endif
1212

13-
@MainActor
1413
func testListWithInsetGroupedStyle() throws {
1514
guard #available(iOS 14, *) else {
1615
throw XCTSkip()

‎Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ final class ListWithInsetStyleTests: XCTestCase {
1212
typealias PlatformListWithInsetStyle = NSTableView
1313
#endif
1414

15-
@MainActor
1615
func testListWithInsetStyle() throws {
1716
guard #available(iOS 14, macOS 11, *) else {
1817
throw XCTSkip()

‎Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class ListWithPlainStyleTests: XCTestCase {
1010
typealias PlatformListWithPlainStyle = NSTableView
1111
#endif
1212

13-
@MainActor
1413
func testListWithPlainStyle() {
1514
XCTAssertViewIntrospection(of: PlatformListWithPlainStyle.self) { spies in
1615
let spy0 = spies[0]

‎Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ final class ListWithSidebarStyleTests: XCTestCase {
1212
typealias PlatformListWithSidebarStyle = NSTableView
1313
#endif
1414

15-
@MainActor
1615
func testListWithSidebarStyle() throws {
1716
guard #available(iOS 14, macOS 10.15, *) else {
1817
throw XCTSkip()

‎Tests/Tests/ViewTypes/MapTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import XCTest
99
final class MapTests: XCTestCase {
1010
typealias PlatformMap = MKMapView
1111

12-
@MainActor
1312
func testMap() throws {
1413
guard #available(iOS 14, tvOS 14, macOS 11, *) else {
1514
throw XCTSkip()

‎Tests/Tests/ViewTypes/NavigationSplitViewTests.swift

-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ final class NavigationSplitViewTests: XCTestCase {
1313
typealias PlatformNavigationSplitView = NSSplitView
1414
#endif
1515

16-
@MainActor
1716
func testNavigationSplitView() throws {
1817
guard #available(iOS 16, tvOS 16, macOS 13, *) else {
1918
throw XCTSkip()
@@ -43,7 +42,6 @@ final class NavigationSplitViewTests: XCTestCase {
4342
}
4443
}
4544

46-
@MainActor
4745
func testNavigationSplitViewAsAncestor() throws {
4846
guard #available(iOS 16, tvOS 16, macOS 13, *) else {
4947
throw XCTSkip()

‎Tests/Tests/ViewTypes/NavigationStackTests.swift

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class NavigationStackTests: XCTestCase {
1010
typealias PlatformNavigationStack = UINavigationController
1111
#endif
1212

13-
@MainActor
1413
func testNavigationStack() throws {
1514
guard #available(iOS 16, tvOS 16, *) else {
1615
throw XCTSkip()
@@ -31,7 +30,6 @@ final class NavigationStackTests: XCTestCase {
3130
}
3231
}
3332

34-
@MainActor
3533
func testNavigationStackAsAncestor() throws {
3634
guard #available(iOS 16, tvOS 16, *) else {
3735
throw XCTSkip()

‎Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ final class NavigationViewWithColumnsStyleTests: XCTestCase {
1212
typealias PlatformNavigationViewWithColumnsStyle = NSSplitView
1313
#endif
1414

15-
@MainActor
1615
func testNavigationViewWithColumnsStyle() {
1716
XCTAssertViewIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in
1817
let spy = spies[0]
@@ -34,7 +33,6 @@ final class NavigationViewWithColumnsStyleTests: XCTestCase {
3433
}
3534
}
3635

37-
@MainActor
3836
func testNavigationViewWithColumnsStyleAsAncestor() {
3937
XCTAssertViewIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in
4038
let spy = spies[0]

‎Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ final class NavigationViewWithStackStyleTests: XCTestCase {
99
typealias PlatformNavigationViewWithStackStyle = UINavigationController
1010
#endif
1111

12-
@MainActor
1312
func testNavigationViewWithStackStyle() {
1413
XCTAssertViewIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in
1514
let spy = spies[0]
@@ -27,7 +26,6 @@ final class NavigationViewWithStackStyleTests: XCTestCase {
2726
}
2827
}
2928

30-
@MainActor
3129
func testNavigationViewWithStackStyleAsAncestor() {
3230
XCTAssertViewIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in
3331
let spy = spies[0]

‎Tests/Tests/ViewTypes/PageControlTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class PageControlTests: XCTestCase {
1010
typealias PlatformPageControl = UIPageControl
1111
#endif
1212

13-
@MainActor
1413
func testPageControl() throws {
1514
guard #available(iOS 14, tvOS 14, *) else {
1615
throw XCTSkip()

‎Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ final class PickerWithMenuStyleTests: XCTestCase {
99
typealias PlatformPickerWithMenuStyle = NSPopUpButton
1010
#endif
1111

12-
@MainActor
1312
func testPickerWithMenuStyle() {
1413
XCTAssertViewIntrospection(of: PlatformPickerWithMenuStyle.self) { spies in
1514
let spy0 = spies[0]

‎Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class PickerWithSegmentedStyleTests: XCTestCase {
1010
typealias PlatformPickerWithSegmentedStyle = NSSegmentedControl
1111
#endif
1212

13-
@MainActor
1413
func testPickerWithSegmentedStyle() {
1514
XCTAssertViewIntrospection(of: PlatformPickerWithSegmentedStyle.self) { spies in
1615
let spy0 = spies[0]

‎Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ final class PickerWithWheelStyleTests: XCTestCase {
99
typealias PlatformPickerWithWheelStyle = UIPickerView
1010
#endif
1111

12-
@MainActor
1312
func testPickerWithWheelStyle() {
1413
XCTAssertViewIntrospection(of: PlatformPickerWithWheelStyle.self) { spies in
1514
let spy0 = spies[0]

‎Tests/Tests/ViewTypes/PopoverTests.swift

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import XCTest
55

66
@MainActor
77
final class PopoverTests: XCTestCase {
8-
9-
@MainActor
108
func testPopover() throws {
119
XCTAssertViewIntrospection(of: UIPopoverPresentationController.self) { spies in
1210
let spy0 = spies[0]

‎Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class ProgressViewWithCircularStyleTests: XCTestCase {
1010
typealias PlatformProgressViewWithCircularStyle = NSProgressIndicator
1111
#endif
1212

13-
@MainActor
1413
func testProgressViewWithCircularStyle() throws {
1514
guard #available(iOS 14, tvOS 14, macOS 11, *) else {
1615
throw XCTSkip()

‎Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class ProgressViewWithLinearStyleTests: XCTestCase {
1010
typealias PlatformProgressViewWithLinearStyle = NSProgressIndicator
1111
#endif
1212

13-
@MainActor
1413
func testProgressViewWithLinearStyle() throws {
1514
guard #available(iOS 14, tvOS 14, macOS 11, *) else {
1615
throw XCTSkip()

‎Tests/Tests/ViewTypes/ScrollViewTests.swift

-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ final class ScrollViewTests: XCTestCase {
1010
typealias PlatformScrollView = NSScrollView
1111
#endif
1212

13-
@MainActor
1413
func testScrollView() {
1514
XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in
1615
let spy0 = spies[0]
@@ -51,7 +50,6 @@ final class ScrollViewTests: XCTestCase {
5150
}
5251
}
5352

54-
@MainActor
5553
func testNestedScrollView() {
5654
XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in
5755
let spy0 = spies[0]
@@ -90,7 +88,6 @@ final class ScrollViewTests: XCTestCase {
9088
}
9189
}
9290

93-
@MainActor
9491
func testMaskedScrollView() {
9592
XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in
9693
let spy0 = spies[0]

0 commit comments

Comments
 (0)