Add support for correctly discovering async test methods on non-Apple platforms (#3844)

* Update `TestDiscoveryCommand` to wrap async test methods in `asyncTest` function calls.

* Add integration test

* Adapt to the latest s-t-s-c modeling adjustments.

Author: briancroom

Fixtures/Miscellaneous/TestDiscovery/Async/Package.swift

@@ -0,0 +1,10 @@
+// swift-tools-version:4.2
+import PackageDescription
+
+let package = Package(
+    name: "Async",
+    targets: [
+        .target(name: "Async"),
+        .testTarget(name: "AsyncTests", dependencies: ["Async"]),
+    ]
+)

Fixtures/Miscellaneous/TestDiscovery/Async/Sources/Async/Async.swift

@@ -0,0 +1,3 @@
+struct Async {
+
+}

Fixtures/Miscellaneous/TestDiscovery/Async/Tests/AsyncTests/SwiftTests.swift

@@ -0,0 +1,16 @@
+import XCTest
+@testable import Async
+
+class AsyncTests: XCTestCase {
+
+    func testAsync() async {
+    }
+
+    @MainActor func testMainActor() async {
+        XCTAssertTrue(Thread.isMainThread)
+    }
+
+    func testNotAsync() {
+        XCTAssertTrue(Thread.isMainThread)
+    }
+}

Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

@@ -45,6 +45,15 @@ class CustomLLBuildCommand: SPMLLBuild.ExternalCommand {
     }
 }
 
+private extension IndexStore.TestCaseClass.TestMethod {
+
+    var allTestsEntry: String {
+        let baseName = name.hasSuffix("()") ? String(name.dropLast(2)) : name
+
+        return "(\"\(baseName)\", \(isAsync ? "asyncTest(\(baseName))" : baseName ))"
+    }
+}
+
 final class TestDiscoveryCommand: CustomLLBuildCommand {
 
     private func write(
@@ -61,13 +70,12 @@ final class TestDiscoveryCommand: CustomLLBuildCommand {
 
         for iterator in testsByClassNames {
             let className = iterator.key
-            let testMethods = iterator.value.flatMap{ $0.methods }
+            let testMethods = iterator.value.flatMap{ $0.testMethods }
             stream <<< "\n"
             stream <<< "fileprivate extension " <<< className <<< " {" <<< "\n"
             stream <<< indent(4) <<< "static let __allTests__\(className) = [" <<< "\n"
             for method in testMethods {
-                let method = method.hasSuffix("()") ? String(method.dropLast(2)) : method
-                stream <<< indent(8) <<< "(\"\(method)\", \(method))," <<< "\n"
+                stream <<< indent(8) <<< method.allTestsEntry <<< ",\n"
             }
             stream <<< indent(4) <<< "]" <<< "\n"
             stream <<< "}" <<< "\n"

Tests/FunctionalTests/TestDiscoveryTests.swift

@@ -51,6 +51,19 @@ class TestDiscoveryTests: XCTestCase {
         }
     }
 
+    func testAsyncMethods() throws {
+        fixture(name: "Miscellaneous/TestDiscovery/Async") { path in
+            let (stdout, stderr) = try executeSwiftTest(path)
+            #if os(macOS)
+            XCTAssertMatch(stdout, .contains("module Async"))
+            XCTAssertMatch(stderr, .contains("Executed 3 tests"))
+            #else
+            XCTAssertMatch(stdout, .contains("module Async"))
+            XCTAssertMatch(stdout, .contains("Executed 3 tests"))
+            #endif
+        }
+    }
+
     func testManifestOverride() throws {
         #if os(macOS)
         try XCTSkipIf(true)