A few minor edits for style, whitespace, and documentation cleanup

Author: stmontgomery

Sources/XCTest/Private/XCTestCase.TearDownBlocksState.swift

@@ -5,23 +5,21 @@
 //
 // See http://swift.org/LICENSE.txt for license information
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//  XCTestCase.TeardownBlocksState
-//  A class which encapsulates teardown blocks which are registered via the `addTearDownBlock(_block:)` method.
-//  Supports async and sync throwing methods
 
 extension XCTestCase {
+
+    /// A class which encapsulates teardown blocks which are registered via the `addTeardownBlock(_:)` method.
+    /// Supports async and sync throwing methods.
     final class TeardownBlocksState {
 
         private var wasFinalized = false
         private var blocks: [() throws -> Void] = []
 
-        @available(macOS 12, *)
-        
         // We don't want to overload append(_:) below because of how Swift will implicitly promote sync closures to async closures,
         // which can unexpectedly change their semantics in difficult to track down ways.
         //
         // Because of this, we chose the unusual decision to forgo overloading (which is a super sweet language feature <3) to prevent this issue from surprising any contributors to corelibs-xctest
+        @available(macOS 12.0, *)
         func appendAsync(_ block: @Sendable @escaping () async throws -> Void) {
             self.append {
                 try awaitUsingExpectation { try await block() }

Sources/XCTest/Public/XCAbstractTest.swift

@@ -52,7 +52,7 @@ open class XCTest {
         perform(testRun!)
     }
 
-    /// Async setup method called before the invocation of `setUp` for each test method in the class.
+    /// Async setup method called before the invocation of `setUpWithError` for each test method in the class.
     @available(macOS 12.0, *)
     open func setUp() async throws {}
 

Sources/XCTest/Public/XCTestCase.swift

@@ -35,7 +35,6 @@ open class XCTestCase: XCTest {
     private let testClosure: XCTestCaseClosure
 
     private var skip: XCTSkip?
-    private let teardownBlocksState = TeardownBlocksState()
 
     /// The name of the test case, consisting of its class name and the method
     /// name it will run.
@@ -195,13 +194,15 @@ open class XCTestCase: XCTest {
     /// Teardown method called after the invocation of every test method in the
     /// class.
     open class func tearDown() {}
-    
+
+    private let teardownBlocksState = TeardownBlocksState()
+
     /// Registers a block of teardown code to be run after the current test
     /// method ends.
     open func addTeardownBlock(_ block: @escaping () -> Void) {
         teardownBlocksState.append(block)
     }
-    
+
     /// Registers a block of teardown code to be run after the current test
     /// method ends.
     @available(macOS 12.0, *)
@@ -212,7 +213,7 @@ open class XCTestCase: XCTest {
     private func performSetUpSequence() {
         func handleErrorDuringSetUp(_ error: Error) {
             if error.xct_shouldRecordAsTestFailure {
-                self.recordFailure(for: error)
+                recordFailure(for: error)
             }
 
             if error.xct_shouldSkipTestInvocation {
@@ -235,22 +236,21 @@ open class XCTestCase: XCTest {
         }
 
         do {
-            try self.setUpWithError()
+            try setUpWithError()
         } catch {
             handleErrorDuringSetUp(error)
         }
 
-        self.setUp()
+        setUp()
     }
-    
-    
+
     private func performTearDownSequence() {
         func handleErrorDuringTearDown(_ error: Error) {
             if error.xct_shouldRecordAsTestFailure {
                 recordFailure(for: error)
             }
         }
-        
+
         func runTeardownBlocks() {
             for block in self.teardownBlocksState.finalize().reversed() {
                 do {
@@ -260,7 +260,7 @@ open class XCTestCase: XCTest {
                 }
             }
         }
-        
+
         runTeardownBlocks()
 
         tearDown()