CI: remove some redundant #ifs in tests (#495)

davdroman · web-flow · commit 924d3cc8e947 · 2025-09-24T14:54:41.000+01:00
diff --git a/Tests/Tests/ViewTypes/ButtonTests.swift b/Tests/Tests/ViewTypes/ButtonTests.swift
@@ -6,9 +6,7 @@ import Testing
 @MainActor
 @Suite
 struct ButtonTests {
-	#if canImport(AppKit)
 	typealias PlatformButton = NSButton
-	#endif
 
 	@available(macOS, introduced: 10.15, obsoleted: 26.0)
 	@Test func introspectButtonsBeforeMacOS26() async throws {
diff --git a/Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithFieldStyleTests.swift
@@ -6,9 +6,7 @@ import Testing
 @MainActor
 @Suite
 struct DatePickerWithFieldStyleTests {
-	#if canImport(AppKit) && !targetEnvironment(macCatalyst)
 	typealias PlatformDatePickerWithFieldStyle = NSDatePicker
-	#endif
 
 	@Test func introspect() async throws {
 		let date1 = Date(timeIntervalSince1970: 0)
@@ -19,30 +17,22 @@ struct DatePickerWithFieldStyleTests {
 			VStack {
 				DatePicker("", selection: .constant(date1))
 					.datePickerStyle(.field)
-					#if os(macOS)
 					.introspect(.datePicker(style: .field), on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15, .v26), customize: spy1)
-					#endif
 					.cornerRadius(8)
 
 				DatePicker("", selection: .constant(date2))
 					.datePickerStyle(.field)
-					#if os(macOS)
 					.introspect(.datePicker(style: .field), on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15, .v26), customize: spy2)
-					#endif
 					.cornerRadius(8)
 
 				DatePicker("", selection: .constant(date3))
 					.datePickerStyle(.field)
-					#if os(macOS)
 					.introspect(.datePicker(style: .field), on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15, .v26), customize: spy3)
-					#endif
 			}
 		}
-		#if canImport(AppKit) && !targetEnvironment(macCatalyst)
 		#expect(entity1.dateValue == date1)
 		#expect(entity2.dateValue == date2)
 		#expect(entity3.dateValue == date3)
-		#endif
 	}
 }
 #endif
diff --git a/Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithStepperFieldStyleTests.swift
@@ -5,9 +5,7 @@ import Testing
 
 @MainActor
 @Suite struct DatePickerWithStepperFieldStyleTests {
-	#if canImport(AppKit) && !targetEnvironment(macCatalyst)
 	typealias PlatformDatePickerWithStepperFieldStyle = NSDatePicker
-	#endif
 
 	@Test func introspect() async throws {
 		let date1 = Date(timeIntervalSince1970: 0)
@@ -18,30 +16,22 @@ import Testing
 			VStack {
 				DatePicker("", selection: .constant(date1))
 					.datePickerStyle(.stepperField)
-					#if os(macOS)
 					.introspect(.datePicker(style: .stepperField), on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15, .v26), customize: spy1)
-					#endif
 					.cornerRadius(8)
 
 				DatePicker("", selection: .constant(date2))
 					.datePickerStyle(.stepperField)
-					#if os(macOS)
 					.introspect(.datePicker(style: .stepperField), on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15, .v26), customize: spy2)
-					#endif
 					.cornerRadius(8)
 
 				DatePicker("", selection: .constant(date3))
 					.datePickerStyle(.stepperField)
-					#if os(macOS)
 					.introspect(.datePicker(style: .stepperField), on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15, .v26), customize: spy3)
-					#endif
 			}
 		}
-		#if canImport(AppKit) && !targetEnvironment(macCatalyst)
 		#expect(entity1.dateValue == date1)
 		#expect(entity2.dateValue == date2)
 		#expect(entity3.dateValue == date3)
-		#endif
 	}
 }
 #endif
diff --git a/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift
@@ -6,9 +6,7 @@ import Testing
 @MainActor
 @Suite
 struct DatePickerWithWheelStyleTests {
-	#if canImport(UIKit)
 	typealias PlatformDatePickerWithWheelStyle = UIDatePicker
-	#endif
 
 	@Test func introspect() async throws {
 		let date1 = Date(timeIntervalSince1970: 0)
@@ -19,30 +17,22 @@ struct DatePickerWithWheelStyleTests {
 			VStack {
 				DatePicker("", selection: .constant(date1))
 					.datePickerStyle(.wheel)
-					#if os(iOS) || os(visionOS)
 					.introspect(.datePicker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), customize: spy1)
-					#endif
 					.cornerRadius(8)
 
 				DatePicker("", selection: .constant(date2))
 					.datePickerStyle(.wheel)
-					#if os(iOS) || os(visionOS)
 					.introspect(.datePicker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), customize: spy2)
-					#endif
 					.cornerRadius(8)
 
 				DatePicker("", selection: .constant(date3))
 					.datePickerStyle(.wheel)
-					#if os(iOS) || os(visionOS)
 					.introspect(.datePicker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), customize: spy3)
-					#endif
 			}
 		}
-		#if canImport(UIKit)
 		#expect(entity1.date == date1)
 		#expect(entity2.date == date2)
 		#expect(entity3.date == date3)
-		#endif
 	}
 }
 #endif
diff --git a/Tests/Tests/ViewTypes/FullScreenCoverTests.swift b/Tests/Tests/ViewTypes/FullScreenCoverTests.swift
@@ -11,13 +11,11 @@ struct FullScreenCoverTests {
 			Text("Root")
 				.fullScreenCover(isPresented: .constant(true)) {
 					Text("Content")
-						#if os(iOS) || os(tvOS) || os(visionOS)
 						.introspect(
 							.fullScreenCover,
 							on: .iOS(.v14, .v15, .v16, .v17, .v18, .v26), .tvOS(.v14, .v15, .v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26),
 							customize: spy
 						)
-						#endif
 				}
 		}
 	}
diff --git a/Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithBorderedStyleTests.swift
@@ -6,9 +6,7 @@ import Testing
 @MainActor
 @Suite
 struct ListWithBorderedStyleTests {
-	#if canImport(AppKit)
 	typealias PlatformListWithBorderedStyle = NSTableView
-	#endif
 
 	@available(macOS 12, *)
 	@Test func introspect() async throws {
@@ -18,15 +16,11 @@ struct ListWithBorderedStyleTests {
 					Text("Item 1")
 				}
 				.listStyle(.bordered)
-				#if os(macOS)
 				.introspect(.list(style: .bordered), on: .macOS(.v12, .v13, .v14, .v15, .v26), customize: spy1)
-				#endif
 
 				List {
 					Text("Item 1")
-					#if os(macOS)
 					.introspect(.list(style: .bordered), on: .macOS(.v12, .v13, .v14, .v15, .v26), scope: .ancestor, customize: spy2)
-					#endif
 				}
 				.listStyle(.bordered)
 			}
diff --git a/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift
@@ -6,9 +6,7 @@ import Testing
 @MainActor
 @Suite
 struct ListWithGroupedStyleTests {
-	#if canImport(UIKit)
 	typealias PlatformListWithGroupedStyle = UIScrollView // covers both UITableView and UICollectionView
-	#endif
 
 	@Test func introspect() async throws {
 		let (entity1, entity2) = try await introspection(of: PlatformListWithGroupedStyle.self) { spy1, spy2 in
@@ -17,17 +15,13 @@ struct ListWithGroupedStyleTests {
 					Text("Item 1")
 				}
 				.listStyle(.grouped)
-				#if os(iOS) || os(tvOS) || os(visionOS)
 				.introspect(.list(style: .grouped), on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), customize: spy1)
 				.introspect(.list(style: .grouped), on: .iOS(.v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), customize: spy1)
-				#endif
 
 				List {
 					Text("Item 1")
-					#if os(iOS) || os(tvOS) || os(visionOS)
 					.introspect(.list(style: .grouped), on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), scope: .ancestor, customize: spy2)
 					.introspect(.list(style: .grouped), on: .iOS(.v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), scope: .ancestor, customize: spy2)
-					#endif
 				}
 				.listStyle(.grouped)
 			}
diff --git a/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift
@@ -6,9 +6,7 @@ import Testing
 @MainActor
 @Suite
 struct ListWithInsetGroupedStyleTests {
-	#if canImport(UIKit)
 	typealias PlatformListWithInsetGroupedStyle = UIScrollView // covers both UITableView and UICollectionView
-	#endif
 
 	@Test func introspect() async throws {
 		let (entity1, entity2) = try await introspection(of: PlatformListWithInsetGroupedStyle.self) { spy1, spy2 in
@@ -17,17 +15,13 @@ struct ListWithInsetGroupedStyleTests {
 					Text("Item 1")
 				}
 				.listStyle(.insetGrouped)
-				#if os(iOS) || os(visionOS)
 				.introspect(.list(style: .insetGrouped), on: .iOS(.v14, .v15), customize: spy1)
 				.introspect(.list(style: .insetGrouped), on: .iOS(.v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), customize: spy1)
-				#endif
 
 				List {
 					Text("Item 1")
-					#if os(iOS) || os(visionOS)
 					.introspect(.list(style: .insetGrouped), on: .iOS(.v14, .v15), scope: .ancestor, customize: spy2)
 					.introspect(.list(style: .insetGrouped), on: .iOS(.v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), scope: .ancestor, customize: spy2)
-					#endif
 				}
 				.listStyle(.insetGrouped)
 			}
diff --git a/Tests/Tests/ViewTypes/NavigationStackTests.swift b/Tests/Tests/ViewTypes/NavigationStackTests.swift
@@ -6,9 +6,7 @@ import Testing
 @MainActor
 @Suite
 struct NavigationStackTests {
-	#if canImport(UIKit)
 	typealias PlatformNavigationStack = UINavigationController
-	#endif
 
 	@available(iOS 16, tvOS 16, *)
 	@Test func introspect() async throws {
@@ -19,9 +17,7 @@ struct NavigationStackTests {
 					Text("Something")
 				}
 			}
-			#if os(iOS) || os(tvOS) || os(visionOS)
 			.introspect(.navigationStack, on: .iOS(.v16, .v17, .v18, .v26), .tvOS(.v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), customize: spy)
-			#endif
 		}
 	}
 
@@ -32,9 +28,7 @@ struct NavigationStackTests {
 				ZStack {
 					Color.red
 					Text("Something")
-						#if os(iOS) || os(tvOS) || os(visionOS)
 						.introspect(.navigationStack, on: .iOS(.v16, .v17, .v18, .v26), .tvOS(.v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), scope: .ancestor, customize: spy)
-						#endif
 				}
 			}
 		}
diff --git a/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift b/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift
@@ -6,9 +6,7 @@ import Testing
 @MainActor
 @Suite
 struct NavigationViewWithStackStyleTests {
-	#if canImport(UIKit)
 	typealias PlatformNavigationViewWithStackStyle = UINavigationController
-	#endif
 
 	@Test func introspect() async throws {
 		try await introspection(of: PlatformNavigationViewWithStackStyle.self) { spy in
@@ -19,9 +17,7 @@ struct NavigationViewWithStackStyleTests {
 				}
 			}
 			.navigationViewStyle(.stack)
-			#if os(iOS) || os(tvOS) || os(visionOS)
 			.introspect(.navigationView(style: .stack), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), customize: spy)
-			#endif
 		}
 	}
 
@@ -31,9 +27,7 @@ struct NavigationViewWithStackStyleTests {
 				ZStack {
 					Color.red
 					Text("Something")
-						#if os(iOS) || os(tvOS) || os(visionOS)
 						.introspect(.navigationView(style: .stack), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), scope: .ancestor, customize: spy)
-						#endif
 				}
 			}
 			.navigationViewStyle(.stack)
diff --git a/Tests/Tests/ViewTypes/PageControlTests.swift b/Tests/Tests/ViewTypes/PageControlTests.swift
@@ -6,9 +6,7 @@ import Testing
 @MainActor
 @Suite
 struct PageControlTests {
-	#if canImport(UIKit)
 	typealias PlatformPageControl = UIPageControl
-	#endif
 
 	@Test func introspect() async throws {
 		try await introspection(of: PlatformPageControl.self) { spy in
@@ -17,9 +15,7 @@ struct PageControlTests {
 				Text("Page 2").frame(maxWidth: .infinity, maxHeight: .infinity).background(Color.blue)
 			}
 			.tabViewStyle(.page(indexDisplayMode: .always))
-			#if os(iOS) || os(tvOS) || os(visionOS)
 			.introspect(.pageControl, on: .iOS(.v14, .v15, .v16, .v17, .v18, .v26), .tvOS(.v14, .v15, .v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), customize: spy)
-			#endif
 		}
 	}
 }
diff --git a/Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift b/Tests/Tests/ViewTypes/PickerWithMenuStyleTests.swift
@@ -6,9 +6,7 @@ import Testing
 @MainActor
 @Suite
 struct PickerWithMenuStyleTests {
-	#if canImport(AppKit) && !targetEnvironment(macCatalyst)
 	typealias PlatformPickerWithMenuStyle = NSPopUpButton
-	#endif
 
 	@Test func introspect() async throws {
 		let (entity1, entity2, entity3) = try await introspection(of: PlatformPickerWithMenuStyle.self) { spy1, spy2, spy3 in
@@ -17,19 +15,15 @@ struct PickerWithMenuStyleTests {
 					Text("1").tag("1")
 				}
 				.pickerStyle(.menu)
-				#if os(macOS)
 				.introspect(.picker(style: .menu), on: .macOS(.v11, .v12, .v13, .v14, .v15, .v26), customize: spy1)
-				#endif
 				.cornerRadius(8)
 
 				Picker("Pick", selection: .constant("1")) {
 					Text("1").tag("1")
 					Text("2").tag("2")
 				}
 				.pickerStyle(.menu)
-				#if os(macOS)
 				.introspect(.picker(style: .menu), on: .macOS(.v11, .v12, .v13, .v14, .v15, .v26), customize: spy2)
-				#endif
 				.cornerRadius(8)
 
 				Picker("Pick", selection: .constant("1")) {
@@ -38,16 +32,12 @@ struct PickerWithMenuStyleTests {
 					Text("3").tag("3")
 				}
 				.pickerStyle(.menu)
-				#if os(macOS)
 				.introspect(.picker(style: .menu), on: .macOS(.v11, .v12, .v13, .v14, .v15, .v26), customize: spy3)
-				#endif
 			}
 		}
-		#if canImport(AppKit) && !targetEnvironment(macCatalyst)
 		#expect(entity1.numberOfItems == 1)
 		#expect(entity2.numberOfItems == 2)
 		#expect(entity3.numberOfItems == 3)
-		#endif
 	}
 }
 #endif
diff --git a/Tests/Tests/ViewTypes/SearchFieldTests.swift b/Tests/Tests/ViewTypes/SearchFieldTests.swift
diff --git a/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift b/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift
diff --git a/Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift b/Tests/Tests/ViewTypes/ToggleWithCheckboxStyleTests.swift
diff --git a/Tests/Tests/ViewTypes/WebViewTests.swift b/Tests/Tests/ViewTypes/WebViewTests.swift

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,11 @@ struct FullScreenCoverTests {`
`11`	`11`	`Text("Root")`
`12`	`12`	`.fullScreenCover(isPresented: .constant(true)) {`
`13`	`13`	`Text("Content")`
`14`		`- #if os(iOS) \|\| os(tvOS) \|\| os(visionOS)`
`15`	`14`	`.introspect(`
`16`	`15`	`.fullScreenCover,`
`17`	`16`	`on: .iOS(.v14, .v15, .v16, .v17, .v18, .v26), .tvOS(.v14, .v15, .v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26),`
`18`	`17`	`customize: spy`
`19`	`18`	`)`
`20`		`- #endif`
`21`	`19`	`}`
`22`	`20`	`}`
`23`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,7 @@ import Testing`
`6`	`6`	`@MainActor`
`7`	`7`	`@Suite`
`8`	`8`	`struct NavigationStackTests {`
`9`		`- #if canImport(UIKit)`
`10`	`9`	`typealias PlatformNavigationStack = UINavigationController`
`11`		`- #endif`
`12`	`10`
`13`	`11`	`@available(iOS 16, tvOS 16, *)`
`14`	`12`	`@Test func introspect() async throws {`
`@@ -19,9 +17,7 @@ struct NavigationStackTests {`
`19`	`17`	`Text("Something")`
`20`	`18`	`}`
`21`	`19`	`}`
`22`		`- #if os(iOS) \|\| os(tvOS) \|\| os(visionOS)`
`23`	`20`	`.introspect(.navigationStack, on: .iOS(.v16, .v17, .v18, .v26), .tvOS(.v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), customize: spy)`
`24`		`- #endif`
`25`	`21`	`}`
`26`	`22`	`}`
`27`	`23`
`@@ -32,9 +28,7 @@ struct NavigationStackTests {`
`32`	`28`	`ZStack {`
`33`	`29`	`Color.red`
`34`	`30`	`Text("Something")`
`35`		`- #if os(iOS) \|\| os(tvOS) \|\| os(visionOS)`
`36`	`31`	`.introspect(.navigationStack, on: .iOS(.v16, .v17, .v18, .v26), .tvOS(.v16, .v17, .v18, .v26), .visionOS(.v1, .v2, .v26), scope: .ancestor, customize: spy)`
`37`		`- #endif`
`38`	`32`	`}`
`39`	`33`	`}`
`40`	`34`	`}`