Tests: Minor tweaks in Swift Build related tests

pmattos · pmattos · commit 74241100c1e1 · 2025-04-11T19:08:25.000-07:00
diff --git a/Tests/BuildTests/BuildPlanTests.swift b/Tests/BuildTests/BuildPlanTests.swift
@@ -6977,23 +6977,15 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
     }
 }
 
-class BuildPlanNativeTests: BuildPlanTestCase {
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .native
-    }
-
-    override func testDuplicateProductNamesWithNonDefaultLibsThrowError() async throws {
-        try await super.testDuplicateProductNamesWithNonDefaultLibsThrowError()
+final class BuildPlanNativeTests: BuildPlanTestCase {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .native
     }
 }
 
-class BuildPlanSwiftBuildTests: BuildPlanTestCase {
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .swiftbuild
-    }
-
-    override func testDuplicateProductNamesWithNonDefaultLibsThrowError() async throws {
-        try await super.testDuplicateProductNamesWithNonDefaultLibsThrowError()
+final class BuildPlanSwiftBuildTests: BuildPlanTestCase {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .swiftbuild
     }
 
     override func testTargetsWithPackageAccess() async throws {
@@ -7014,8 +7006,6 @@ class BuildPlanSwiftBuildTests: BuildPlanTestCase {
             throw XCTSkip("Skipping SwiftBuild testing on Amazon Linux because of platform issues.")
         }
 #endif
-
         try await super.testPackageNameFlag()
     }
-
 }
diff --git a/Tests/CommandsTests/APIDiffTests.swift b/Tests/CommandsTests/APIDiffTests.swift
@@ -455,25 +455,14 @@ class APIDiffTestCase: CommandsBuildProviderTestCase {
     }
 }
 
-class APIDiffNativeTests: APIDiffTestCase {
-
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .native
-    }
-
-    override func skipIfApiDigesterUnsupportedOrUnset() throws {
-        try super.skipIfApiDigesterUnsupportedOrUnset()
+final class APIDiffNativeTests: APIDiffTestCase {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .native
     }
-
 }
 
-class APIDiffSwiftBuildTests: APIDiffTestCase {
-
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .swiftbuild
-    }
-
-    override func skipIfApiDigesterUnsupportedOrUnset() throws {
-        try super.skipIfApiDigesterUnsupportedOrUnset()
+final class APIDiffSwiftBuildTests: APIDiffTestCase {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .swiftbuild
     }
 }
diff --git a/Tests/CommandsTests/BuildCommandTests.swift b/Tests/CommandsTests/BuildCommandTests.swift
@@ -782,27 +782,17 @@ class BuildCommandTestCases: CommandsBuildProviderTestCase {
 
 }
 
-
-class BuildCommandNativeTests: BuildCommandTestCases {
-
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .native
-    }
-
-    override func testUsage() async throws {
-        try await super.testUsage()
+final class BuildCommandNativeTests: BuildCommandTestCases {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .native
     }
 }
 
 #if os(macOS)
-// Xcode build system tests can only function on macOS
-class BuildCommandXcodeTests: BuildCommandTestCases {
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .xcode
-    }
-
-    override func testUsage() async throws {
-        try await super.testUsage()
+/// Xcode build system tests can only function on macOS.
+final class BuildCommandXcodeTests: BuildCommandTestCases {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .xcode
     }
 
     override func testAutomaticParseableInterfacesWithLibraryEvolution() async throws {
@@ -855,10 +845,9 @@ class BuildCommandXcodeTests: BuildCommandTestCases {
 }
 #endif
 
-class BuildCommandSwiftBuildTests: BuildCommandTestCases {
-
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .swiftbuild
+final class BuildCommandSwiftBuildTests: BuildCommandTestCases {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .swiftbuild
     }
 
     override func testNonReachableProductsAndTargetsFunctional() async throws {
@@ -892,7 +881,7 @@ class BuildCommandSwiftBuildTests: BuildCommandTestCases {
     override func testImportOfMissedDepWarning() async throws {
         throw XCTSkip("SWBINTTODO: Test fails because the warning message regarding missing imports is expected to be more verbose and actionable at the SwiftPM level with mention of the involved targets. This needs to be investigated. See case targetDiagnostic(TargetDiagnosticInfo) as a message type that may help.")
     }
-
+        
     override func testProductAndTarget() async throws {
         throw XCTSkip("SWBINTTODO: Test fails because there isn't a clear warning message about the lib1 being an automatic product and that the default product is being built instead. This needs to be investigated")
     }
@@ -946,5 +935,4 @@ class BuildCommandSwiftBuildTests: BuildCommandTestCases {
         try await super.testBuildCompleteMessage()
         #endif
     }
-
 }
diff --git a/Tests/CommandsTests/PackageCommandTests.swift b/Tests/CommandsTests/PackageCommandTests.swift
@@ -3836,26 +3836,15 @@ class PackageCommandTestCase: CommandsBuildProviderTestCase {
     }
 }
 
-
-class PackageCommandNativeTests: PackageCommandTestCase {
-
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .native
-    }
-
-    override func testNoParameters() async throws {
-        try await super.testNoParameters()
+final class PackageCommandNativeTests: PackageCommandTestCase {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .native
     }
 }
 
-class PackageCommandSwiftBuildTests: PackageCommandTestCase {
-
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .swiftbuild
-    }
-
-    override func testNoParameters() async throws {
-        try await super.testNoParameters()
+final class PackageCommandSwiftBuildTests: PackageCommandTestCase {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .swiftbuild
     }
 
     override func testCommandPluginBuildingCallbacks() async throws {
diff --git a/Tests/CommandsTests/RunCommandTests.swift b/Tests/CommandsTests/RunCommandTests.swift
@@ -234,24 +234,15 @@ class RunCommandTestCase: CommandsBuildProviderTestCase {
 
 }
 
-class RunCommandNativeTests: RunCommandTestCase {
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .native
-    }
-
-    override func testUsage() async throws {
-        try await super.testUsage()
+final class RunCommandNativeTests: RunCommandTestCase {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .native
     }
 }
 
-
-class RunCommandSwiftBuildTests: RunCommandTestCase {
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .swiftbuild
-    }
-
-    override func testUsage() async throws {
-        try await super.testUsage()
+final class RunCommandSwiftBuildTests: RunCommandTestCase {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .swiftbuild
     }
 
     override func testMultipleExecutableAndExplicitExecutable() async throws {
diff --git a/Tests/CommandsTests/TestCommandTests.swift b/Tests/CommandsTests/TestCommandTests.swift
@@ -601,27 +601,17 @@ class TestCommandTestCase: CommandsBuildProviderTestCase {
             }
         }
     }
-
 }
 
-class TestCommandNativeTests: TestCommandTestCase {
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .native
-    }
-
-    override func testUsage() async throws {
-        try await super.testUsage()
+final class TestCommandNativeTests: TestCommandTestCase {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .native
     }
 }
 
-
-class TestCommandSwiftBuildTests: TestCommandTestCase {
-    override open var buildSystemProvider: BuildSystemProvider.Kind {
-        return .swiftbuild
-    }
-
-    override func testUsage() async throws {
-        try await super.testUsage()
+final class TestCommandSwiftBuildTests: TestCommandTestCase {
+    override public var buildSystemProvider: BuildSystemProvider.Kind {
+        .swiftbuild
     }
 
     override func testFatalErrorDisplayedCorrectNumberOfTimesWhenSingleXCTestHasFatalErrorInBuildCompilation() async throws {

Original file line number	Diff line number	Diff line change
`@@ -6977,23 +6977,15 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {`
`6977`	`6977`	`}`
`6978`	`6978`	`}`
`6979`	`6979`
`6980`		`-class BuildPlanNativeTests: BuildPlanTestCase {`
`6981`		`- override open var buildSystemProvider: BuildSystemProvider.Kind {`
`6982`		`- return .native`
`6983`		`- }`
`6984`		`-`
`6985`		`- override func testDuplicateProductNamesWithNonDefaultLibsThrowError() async throws {`
`6986`		`- try await super.testDuplicateProductNamesWithNonDefaultLibsThrowError()`
	`6980`	`+final class BuildPlanNativeTests: BuildPlanTestCase {`
	`6981`	`+ override public var buildSystemProvider: BuildSystemProvider.Kind {`
	`6982`	`+ .native`
`6987`	`6983`	`}`
`6988`	`6984`	`}`
`6989`	`6985`
`6990`		`-class BuildPlanSwiftBuildTests: BuildPlanTestCase {`
`6991`		`- override open var buildSystemProvider: BuildSystemProvider.Kind {`
`6992`		`- return .swiftbuild`
`6993`		`- }`
`6994`		`-`
`6995`		`- override func testDuplicateProductNamesWithNonDefaultLibsThrowError() async throws {`
`6996`		`- try await super.testDuplicateProductNamesWithNonDefaultLibsThrowError()`
	`6986`	`+final class BuildPlanSwiftBuildTests: BuildPlanTestCase {`
	`6987`	`+ override public var buildSystemProvider: BuildSystemProvider.Kind {`
	`6988`	`+ .swiftbuild`
`6997`	`6989`	`}`
`6998`	`6990`
`6999`	`6991`	`override func testTargetsWithPackageAccess() async throws {`
`@@ -7014,8 +7006,6 @@ class BuildPlanSwiftBuildTests: BuildPlanTestCase {`
`7014`	`7006`	`throw XCTSkip("Skipping SwiftBuild testing on Amazon Linux because of platform issues.")`
`7015`	`7007`	`}`
`7016`	`7008`	`#endif`
`7017`		`-`
`7018`	`7009`	`try await super.testPackageNameFlag()`
`7019`	`7010`	`}`
`7020`		`-`
`7021`	`7011`	`}`
Original file line number	Diff line number	Diff line change
`@@ -455,25 +455,14 @@ class APIDiffTestCase: CommandsBuildProviderTestCase {`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
`458`		`-class APIDiffNativeTests: APIDiffTestCase {`
`459`		`-`
`460`		`- override open var buildSystemProvider: BuildSystemProvider.Kind {`
`461`		`- return .native`
`462`		`- }`
`463`		`-`
`464`		`- override func skipIfApiDigesterUnsupportedOrUnset() throws {`
`465`		`- try super.skipIfApiDigesterUnsupportedOrUnset()`
	`458`	`+final class APIDiffNativeTests: APIDiffTestCase {`
	`459`	`+ override public var buildSystemProvider: BuildSystemProvider.Kind {`
	`460`	`+ .native`
`466`	`461`	`}`
`467`		`-`
`468`	`462`	`}`
`469`	`463`
`470`		`-class APIDiffSwiftBuildTests: APIDiffTestCase {`
`471`		`-`
`472`		`- override open var buildSystemProvider: BuildSystemProvider.Kind {`
`473`		`- return .swiftbuild`
`474`		`- }`
`475`		`-`
`476`		`- override func skipIfApiDigesterUnsupportedOrUnset() throws {`
`477`		`- try super.skipIfApiDigesterUnsupportedOrUnset()`
	`464`	`+final class APIDiffSwiftBuildTests: APIDiffTestCase {`
	`465`	`+ override public var buildSystemProvider: BuildSystemProvider.Kind {`
	`466`	`+ .swiftbuild`
`478`	`467`	`}`
`479`	`468`	`}`
Original file line number	Diff line number	Diff line change
`@@ -601,27 +601,17 @@ class TestCommandTestCase: CommandsBuildProviderTestCase {`
`601`	`601`	`}`
`602`	`602`	`}`
`603`	`603`	`}`
`604`		`-`
`605`	`604`	`}`
`606`	`605`
`607`		`-class TestCommandNativeTests: TestCommandTestCase {`
`608`		`- override open var buildSystemProvider: BuildSystemProvider.Kind {`
`609`		`- return .native`
`610`		`- }`
`611`		`-`
`612`		`- override func testUsage() async throws {`
`613`		`- try await super.testUsage()`
	`606`	`+final class TestCommandNativeTests: TestCommandTestCase {`
	`607`	`+ override public var buildSystemProvider: BuildSystemProvider.Kind {`
	`608`	`+ .native`
`614`	`609`	`}`
`615`	`610`	`}`
`616`	`611`
`617`		`-`
`618`		`-class TestCommandSwiftBuildTests: TestCommandTestCase {`
`619`		`- override open var buildSystemProvider: BuildSystemProvider.Kind {`
`620`		`- return .swiftbuild`
`621`		`- }`
`622`		`-`
`623`		`- override func testUsage() async throws {`
`624`		`- try await super.testUsage()`
	`612`	`+final class TestCommandSwiftBuildTests: TestCommandTestCase {`
	`613`	`+ override public var buildSystemProvider: BuildSystemProvider.Kind {`
	`614`	`+ .swiftbuild`
`625`	`615`	`}`
`626`	`616`
`627`	`617`	`override func testFatalErrorDisplayedCorrectNumberOfTimesWhenSingleXCTestHasFatalErrorInBuildCompilation() async throws {`