Skip to content

Commit

Permalink
Revert "[Swift 6] Update Tests for Swift 6"
Browse files Browse the repository at this point in the history
This reverts commit b2f97b7.
  • Loading branch information
davdroman committed Jul 16, 2024
1 parent ef13c87 commit bcec0d6
Show file tree
Hide file tree
Showing 52 changed files with 0 additions and 80 deletions.
6 changes: 0 additions & 6 deletions Tests/Tests/PlatformVersionTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import XCTest

final class PlatformVersionTests: XCTestCase {
@MainActor
func test_iOS_isCurrent() {
#if os(iOS)
if #available(iOS 17, *) {
Expand Down Expand Up @@ -45,7 +44,6 @@ final class PlatformVersionTests: XCTestCase {
#endif
}

@MainActor
func test_iOS_isCurrentOrPast() {
#if os(iOS)
if #available(iOS 17, *) {
Expand Down Expand Up @@ -88,7 +86,6 @@ final class PlatformVersionTests: XCTestCase {
#endif
}

@MainActor
func test_macOS_isCurrent() {
#if os(macOS)
if #available(macOS 14, *) {
Expand Down Expand Up @@ -131,7 +128,6 @@ final class PlatformVersionTests: XCTestCase {
#endif
}

@MainActor
func test_macOS_isCurrentOrPast() {
#if os(macOS)
if #available(macOS 14, *) {
Expand Down Expand Up @@ -174,7 +170,6 @@ final class PlatformVersionTests: XCTestCase {
#endif
}

@MainActor
func test_tvOS_isCurrent() {
#if os(tvOS)
if #available(tvOS 17, *) {
Expand Down Expand Up @@ -217,7 +212,6 @@ final class PlatformVersionTests: XCTestCase {
#endif
}

@MainActor
func test_tvOS_isCurrentOrPast() {
#if os(tvOS)
if #available(tvOS 17, *) {
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/ButtonTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ final class ButtonTests: XCTestCase {
typealias PlatformButton = NSButton
#endif

@MainActor
func testButton() {
XCTAssertViewIntrospection(of: PlatformButton.self) { spies in
let spy0 = spies[0]
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/ColorPickerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ final class ColorPickerTests: XCTestCase {
typealias PlatformColorPicker = NSColorWell
#endif

@MainActor
func testColorPicker() throws {
guard #available(iOS 14, macOS 11, *) else {
throw XCTSkip()
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/DatePickerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ final class DatePickerTests: XCTestCase {
typealias PlatformDatePicker = NSDatePicker
#endif

@MainActor
func testDatePicker() {
let date0 = Date(timeIntervalSince1970: 0)
let date1 = Date(timeIntervalSince1970: 5)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ final class DatePickerWithCompactStyleTests: XCTestCase {
typealias PlatformDatePickerWithCompactStyle = NSDatePicker
#endif

@MainActor
func testDatePickerWithCompactStyle() throws {
guard #available(iOS 14, macOS 10.15.4, *) else {
throw XCTSkip()
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ final class DatePickerWithFieldStyleTests: XCTestCase {
typealias PlatformDatePickerWithFieldStyle = NSDatePicker
#endif

@MainActor
func testDatePickerWithFieldStyle() {
let date0 = Date(timeIntervalSince1970: 0)
let date1 = Date(timeIntervalSince1970: 5)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ final class DatePickerWithGraphicalStyleTests: XCTestCase {
typealias PlatformDatePickerWithGraphicalStyle = NSDatePicker
#endif

@MainActor
func testDatePickerWithGraphicalStyle() throws {
guard #available(iOS 14, *) else {
throw XCTSkip()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ final class DatePickerWithStepperFieldStyleTests: XCTestCase {
typealias PlatformDatePickerWithStepperFieldStyle = NSDatePicker
#endif

@MainActor
func testDatePickerWithStepperFieldStyle() {
let date0 = Date(timeIntervalSince1970: 0)
let date1 = Date(timeIntervalSince1970: 5)
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ final class DatePickerWithWheelStyleTests: XCTestCase {
typealias PlatformDatePickerWithWheelStyle = UIDatePicker
#endif

@MainActor
func testDatePickerWithWheelStyle() {
let date0 = Date(timeIntervalSince1970: 0)
let date1 = Date(timeIntervalSince1970: 5)
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/FormTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ final class FormTests: XCTestCase {
typealias PlatformForm = NSScrollView
#endif

@MainActor
func testForm() throws {
XCTAssertViewIntrospection(of: PlatformForm.self) { spies in
let spy0 = spies[0]
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ final class FormWithGroupedStyleTests: XCTestCase {
typealias PlatformFormWithGroupedStyle = NSScrollView
#endif

@MainActor
func testFormWithGroupedStyle() throws {
guard #available(iOS 16, tvOS 16, macOS 13, *) else {
throw XCTSkip()
Expand Down
2 changes: 0 additions & 2 deletions Tests/Tests/ViewTypes/FullScreenCoverTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import XCTest
@available(iOS 14, tvOS 14, *)
@MainActor
final class FullScreenCoverTests: XCTestCase {

@MainActor
func testPresentationAsFullScreenCover() throws {
guard #available(iOS 14, tvOS 14, *) else {
throw XCTSkip()
Expand Down
2 changes: 0 additions & 2 deletions Tests/Tests/ViewTypes/ListCellTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class ListCellTests: XCTestCase {
typealias PlatformListCell = NSTableCellView
#endif

@MainActor
func testListCell() {
XCTAssertViewIntrospection(of: PlatformListCell.self) { spies in
let spy = spies[0]
Expand All @@ -27,7 +26,6 @@ final class ListCellTests: XCTestCase {
}
}

@MainActor
func testMaskedListCell() {
XCTAssertViewIntrospection(of: PlatformListCell.self) { spies in
let spy = spies[0]
Expand Down
3 changes: 0 additions & 3 deletions Tests/Tests/ViewTypes/ListTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class ListTests: XCTestCase {
typealias PlatformList = NSTableView
#endif

@MainActor
func testList() {
XCTAssertViewIntrospection(of: PlatformList.self) { spies in
let spy0 = spies[0]
Expand Down Expand Up @@ -43,7 +42,6 @@ final class ListTests: XCTestCase {
}

#if !os(macOS)
@MainActor
func testNestedList() {
XCTAssertViewIntrospection(of: PlatformList.self) { spies in
let spy0 = spies[0]
Expand All @@ -70,7 +68,6 @@ final class ListTests: XCTestCase {
}
#endif

@MainActor
func testMaskedList() {
XCTAssertViewIntrospection(of: PlatformList.self) { spies in
let spy0 = spies[0]
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class ListWithBorderedStyleTests: XCTestCase {
typealias PlatformListWithBorderedStyle = NSTableView
#endif

@MainActor
func testListWithBorderedStyle() throws {
guard #available(macOS 12, *) else {
throw XCTSkip()
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ final class ListWithGroupedStyleTests: XCTestCase {
typealias PlatformListWithGroupedStyle = UIScrollView // covers both UITableView and UICollectionView
#endif

@MainActor
func testListWithGroupedStyle() {
XCTAssertViewIntrospection(of: PlatformListWithGroupedStyle.self) { spies in
let spy0 = spies[0]
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class ListWithInsetGroupedStyleTests: XCTestCase {
typealias PlatformListWithInsetGroupedStyle = UIScrollView // covers both UITableView and UICollectionView
#endif

@MainActor
func testListWithInsetGroupedStyle() throws {
guard #available(iOS 14, *) else {
throw XCTSkip()
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ final class ListWithInsetStyleTests: XCTestCase {
typealias PlatformListWithInsetStyle = NSTableView
#endif

@MainActor
func testListWithInsetStyle() throws {
guard #available(iOS 14, macOS 11, *) else {
throw XCTSkip()
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class ListWithPlainStyleTests: XCTestCase {
typealias PlatformListWithPlainStyle = NSTableView
#endif

@MainActor
func testListWithPlainStyle() {
XCTAssertViewIntrospection(of: PlatformListWithPlainStyle.self) { spies in
let spy0 = spies[0]
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ final class ListWithSidebarStyleTests: XCTestCase {
typealias PlatformListWithSidebarStyle = NSTableView
#endif

@MainActor
func testListWithSidebarStyle() throws {
guard #available(iOS 14, macOS 10.15, *) else {
throw XCTSkip()
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/MapTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import XCTest
final class MapTests: XCTestCase {
typealias PlatformMap = MKMapView

@MainActor
func testMap() throws {
guard #available(iOS 14, tvOS 14, macOS 11, *) else {
throw XCTSkip()
Expand Down
2 changes: 0 additions & 2 deletions Tests/Tests/ViewTypes/NavigationSplitViewTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ final class NavigationSplitViewTests: XCTestCase {
typealias PlatformNavigationSplitView = NSSplitView
#endif

@MainActor
func testNavigationSplitView() throws {
guard #available(iOS 16, tvOS 16, macOS 13, *) else {
throw XCTSkip()
Expand Down Expand Up @@ -43,7 +42,6 @@ final class NavigationSplitViewTests: XCTestCase {
}
}

@MainActor
func testNavigationSplitViewAsAncestor() throws {
guard #available(iOS 16, tvOS 16, macOS 13, *) else {
throw XCTSkip()
Expand Down
2 changes: 0 additions & 2 deletions Tests/Tests/ViewTypes/NavigationStackTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class NavigationStackTests: XCTestCase {
typealias PlatformNavigationStack = UINavigationController
#endif

@MainActor
func testNavigationStack() throws {
guard #available(iOS 16, tvOS 16, *) else {
throw XCTSkip()
Expand All @@ -31,7 +30,6 @@ final class NavigationStackTests: XCTestCase {
}
}

@MainActor
func testNavigationStackAsAncestor() throws {
guard #available(iOS 16, tvOS 16, *) else {
throw XCTSkip()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ final class NavigationViewWithColumnsStyleTests: XCTestCase {
typealias PlatformNavigationViewWithColumnsStyle = NSSplitView
#endif

@MainActor
func testNavigationViewWithColumnsStyle() {
XCTAssertViewIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in
let spy = spies[0]
Expand All @@ -34,7 +33,6 @@ final class NavigationViewWithColumnsStyleTests: XCTestCase {
}
}

@MainActor
func testNavigationViewWithColumnsStyleAsAncestor() {
XCTAssertViewIntrospection(of: PlatformNavigationViewWithColumnsStyle.self) { spies in
let spy = spies[0]
Expand Down
2 changes: 0 additions & 2 deletions Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ final class NavigationViewWithStackStyleTests: XCTestCase {
typealias PlatformNavigationViewWithStackStyle = UINavigationController
#endif

@MainActor
func testNavigationViewWithStackStyle() {
XCTAssertViewIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in
let spy = spies[0]
Expand All @@ -27,7 +26,6 @@ final class NavigationViewWithStackStyleTests: XCTestCase {
}
}

@MainActor
func testNavigationViewWithStackStyleAsAncestor() {
XCTAssertViewIntrospection(of: PlatformNavigationViewWithStackStyle.self) { spies in
let spy = spies[0]
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/PageControlTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class PageControlTests: XCTestCase {
typealias PlatformPageControl = UIPageControl
#endif

@MainActor
func testPageControl() throws {
guard #available(iOS 14, tvOS 14, *) else {
throw XCTSkip()
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ final class PickerWithMenuStyleTests: XCTestCase {
typealias PlatformPickerWithMenuStyle = NSPopUpButton
#endif

@MainActor
func testPickerWithMenuStyle() {
XCTAssertViewIntrospection(of: PlatformPickerWithMenuStyle.self) { spies in
let spy0 = spies[0]
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class PickerWithSegmentedStyleTests: XCTestCase {
typealias PlatformPickerWithSegmentedStyle = NSSegmentedControl
#endif

@MainActor
func testPickerWithSegmentedStyle() {
XCTAssertViewIntrospection(of: PlatformPickerWithSegmentedStyle.self) { spies in
let spy0 = spies[0]
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ final class PickerWithWheelStyleTests: XCTestCase {
typealias PlatformPickerWithWheelStyle = UIPickerView
#endif

@MainActor
func testPickerWithWheelStyle() {
XCTAssertViewIntrospection(of: PlatformPickerWithWheelStyle.self) { spies in
let spy0 = spies[0]
Expand Down
2 changes: 0 additions & 2 deletions Tests/Tests/ViewTypes/PopoverTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import XCTest

@MainActor
final class PopoverTests: XCTestCase {

@MainActor
func testPopover() throws {
XCTAssertViewIntrospection(of: UIPopoverPresentationController.self) { spies in
let spy0 = spies[0]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class ProgressViewWithCircularStyleTests: XCTestCase {
typealias PlatformProgressViewWithCircularStyle = NSProgressIndicator
#endif

@MainActor
func testProgressViewWithCircularStyle() throws {
guard #available(iOS 14, tvOS 14, macOS 11, *) else {
throw XCTSkip()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class ProgressViewWithLinearStyleTests: XCTestCase {
typealias PlatformProgressViewWithLinearStyle = NSProgressIndicator
#endif

@MainActor
func testProgressViewWithLinearStyle() throws {
guard #available(iOS 14, tvOS 14, macOS 11, *) else {
throw XCTSkip()
Expand Down
3 changes: 0 additions & 3 deletions Tests/Tests/ViewTypes/ScrollViewTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ final class ScrollViewTests: XCTestCase {
typealias PlatformScrollView = NSScrollView
#endif

@MainActor
func testScrollView() {
XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in
let spy0 = spies[0]
Expand Down Expand Up @@ -51,7 +50,6 @@ final class ScrollViewTests: XCTestCase {
}
}

@MainActor
func testNestedScrollView() {
XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in
let spy0 = spies[0]
Expand Down Expand Up @@ -90,7 +88,6 @@ final class ScrollViewTests: XCTestCase {
}
}

@MainActor
func testMaskedScrollView() {
XCTAssertViewIntrospection(of: PlatformScrollView.self) { spies in
let spy0 = spies[0]
Expand Down
Loading

0 comments on commit bcec0d6

Please sign in to comment.