Refactor code to make control flow more apparent

Author: Sean Olszewski

Sources/XCTest/Public/XCAbstractTest.swift

@@ -52,7 +52,7 @@ open class XCTest {
         perform(testRun!)
     }
 
-    // TODO: Document
+    /// Async setup method called before the invocation of `setUp` for each test method in the class.
     open func setUp() async throws {}
 
     /// Setup method called before the invocation of `setUp` and the test method
@@ -71,7 +71,8 @@ open class XCTest {
     /// for each test method in the class.
     open func tearDownWithError() throws {}
 
-    // TODO: Document
+    /// Async teardown method which is called after the invocation of `tearDownWithError`
+    /// for each test method in the class.
     open func tearDown() async throws {}
 
     // FIXME: This initializer is required due to a Swift compiler bug on Linux.

Sources/XCTest/Public/XCTestCase.swift

@@ -54,7 +54,10 @@ open class XCTestCase: XCTest {
 
     /// The set of expectations made upon this test case.
     private var _allExpectations = [XCTestExpectation]()
-
+    
+    private var setupEncounteredError = true
+    private static let asyncTestTimeout: TimeInterval = 60 * 60 * 24 * 30
+    
     internal var expectations: [XCTestExpectation] {
         return XCTWaiter.subsystemQueue.sync {
             return _allExpectations
@@ -126,7 +129,9 @@ open class XCTestCase: XCTest {
     open func invokeTest() {
         if skip == nil {
             performSetup()
-            performTest()
+            if !setupEncounteredError {
+                performTest()
+            }
             performTeardown()
         }
 
@@ -149,9 +154,6 @@ open class XCTestCase: XCTest {
         }
     }
 
-    var shouldInvokeTestClosure = true
-    static let asyncTestTimeout: TimeInterval = 60 * 60 * 24 * 30
-    
     func performSetup() {
         let asyncSetUpExpectation = XCTestExpectation(description: "asyncSetUpExpectation")
         Task {
@@ -160,7 +162,7 @@ open class XCTestCase: XCTest {
                 try await setUp()
             } catch {
                 recordError(error)
-                self.shouldInvokeTestClosure = false
+                self.setupEncounteredError = true
             }
         }
         _ = XCTWaiter.wait(for: [asyncSetUpExpectation], timeout: Self.asyncTestTimeout)
@@ -169,33 +171,31 @@ open class XCTestCase: XCTest {
             try setUpWithError()
         } catch {
             recordError(error)
-            self.shouldInvokeTestClosure = false
+            self.setupEncounteredError = true
         }
 
         setUp()
     }
 
     func performTest() {
-        if shouldInvokeTestClosure {
-            switch testClosure {
-            case .sync(let closure):
+        switch testClosure {
+        case .sync(let closure):
+            do {
+                try closure(self)
+            } catch {
+                recordError(error)
+            }
+        case .async(let closure):
+            let testClosureExpectation = XCTestExpectation(description: "testClosureExpectation")
+            Task {
+                defer { testClosureExpectation.fulfill() }
                 do {
-                    try closure(self)
+                    try await closure(self)
                 } catch {
                     recordError(error)
                 }
-            case .async(let closure):
-                let testClosureExpectation = XCTestExpectation(description: "testClosureExpectation")
-                Task {
-                    defer { testClosureExpectation.fulfill() }
-                    do {
-                        try await closure(self)
-                    } catch {
-                        recordError(error)
-                    }
-                }
-                _ = XCTWaiter.wait(for: [testClosureExpectation], timeout: Self.asyncTestTimeout)
             }
+            _ = XCTWaiter.wait(for: [testClosureExpectation], timeout: Self.asyncTestTimeout)
         }
     }