Introduce XCTestCase.ClosureType and XCTRunnableTestCase

Author: Sean Olszewski

Sources/XCTest/Private/XCTestCaseSuite.swift

@@ -24,8 +24,9 @@ internal class XCTestCaseSuite: XCTestSuite {
         super.init(name: String(describing: testCaseClass))
 
         for (testName, testClosure) in testCaseEntry.allTests {
-//            let testCase = testCaseClass.init(name: testName, testClosure: testClosure)
-//            addTest(testCase)
+            let closure = XCTestCase.ClosureType.regular(testClosure)
+            let testCase: XCTestCase = XCTestCase(name: testName, closureType: closure)
+            addTest(testCase)
         }
     }
 

Sources/XCTest/Public/Asynchronous/XCTWaiter.swift

@@ -370,6 +370,7 @@ private extension XCTWaiter {
     func cancelPrimitiveWait() {
         guard let runLoop = runLoop else { return }
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+        // 81589492 (Warning: XCTWaiter.swift:373:31: 'getCFRunLoop()' is deprecated: Directly accessing the run loop may cause your code to not become portable in the future.)
         CFRunLoopStop(runLoop.getCFRunLoop())
 #else
         runLoop._stop()

Sources/XCTest/Public/XCTestCase.ClosureType.swift

@@ -12,7 +12,7 @@
 //
 
 ///  XCTestCase.ClosureType
-///  The type of closure that encapsulates the test code to be executed.
+///  The type of closure which encapsulates the test code to be executed.
 ///  This is used to determine the correct concurrency semantics within XCTest so it can support async/await'd code in tests.
 
 import Foundation

Sources/XCTest/Public/XCTestCase.swift

@@ -139,8 +139,6 @@ open class XCTestCase: XCTest {
     /// Invoking a test performs its setUp, invocation, and tearDown. In
     /// general this should not be called directly.
     open func invokeTest() {
-        //        await performSetUpSequence()
-        //        defer { await performTearDownSequence() }
         do {
             if skip == nil {
                 try unwrapAndInvokeTestClosure()
@@ -171,8 +169,11 @@ open class XCTestCase: XCTest {
         case .async(let closure):
             let expectation = XCTestExpectation(description: "invokeTest completion")
             Task {
+                defer { expectation.fulfill() }
+                await performSetUpSequence()
+
                 try await closure(self)
-                expectation.fulfill()
+                await performTearDownSequence()
             }
 
             // TODO: Copy the comment explaining how this timeout is derived from XCTFailableInvocation in Darin XCTest