Add class-level setUp and tearDown methods on XCTestCase

Author: briancroom

Sources/XCTest/XCTestCase.swift

@@ -129,6 +129,14 @@ public class XCTestCase: XCTest {
             fatalError("Terminating execution due to test failure")
         }
     }
+
+    /// Setup method called before the invocation of any test method in the
+    /// class.
+    public class func setUp() {}
+
+    /// Teardown method called after the invocation of every test method in the
+    /// class.
+    public class func tearDown() {}
 }
 
 /// Wrapper function allowing an array of static test case methods to fit

Sources/XCTest/XCTestMain.swift

@@ -75,14 +75,9 @@
     }
 
     let filter = TestFiltering(selectedTestName: selectedTestName)
-    for (testCaseClass, testCaseMethods) in TestFiltering.filterTests(testCases, filter: filter.selectedTestFilter) {
-        let testCaseSuite = XCTestSuite(name: "\(testCaseClass)")
-        for (testName, testClosure) in testCaseMethods {
-            let testCase = testCaseClass.init(name: testName, testClosure: testClosure)
-            testCaseSuite.addTest(testCase)
-        }
-        currentTestSuite.addTest(testCaseSuite)
-    }
+    TestFiltering.filterTests(testCases, filter: filter.selectedTestFilter)
+        .map(XCTestCaseSuite.init)
+        .forEach(currentTestSuite.addTest)
 
     rootTestSuite.run()
 

Sources/XCTest/XCTestSuite.swift

@@ -68,3 +68,33 @@ public class XCTestSuite: XCTest {
         tests.append(test)
     }
 }
+
+/// A test suite which is associated with a particular test case class. It will
+/// call `setUp` and `tearDown` on the class itself before and after invoking
+/// all of the test cases making up the class.
+internal class XCTestCaseSuite: XCTestSuite {
+    private let testCaseClass: XCTestCase.Type?
+
+    init(testCaseEntry: XCTestCaseEntry) {
+        let testCaseClass = testCaseEntry.0
+        self.testCaseClass = testCaseClass
+        super.init(name: String(testCaseClass))
+
+        for (testName, testClosure) in testCaseEntry.1 {
+            let testCase = testCaseClass.init(name: testName, testClosure: testClosure)
+            addTest(testCase)
+        }
+    }
+
+    override func setUp() {
+        if let testCaseClass = testCaseClass {
+            testCaseClass.setUp()
+        }
+    }
+
+    override func tearDown() {
+        if let testCaseClass = testCaseClass {
+            testCaseClass.tearDown()
+        }
+    }
+}

Tests/Functional/TestCaseLifecycle/main.swift

@@ -21,6 +21,12 @@ class SetUpTearDownTestCase: XCTestCase {
 
     var value = 0
 
+// CHECK: In class setUp\(\)
+    override class func setUp() {
+        super.setUp()
+        print("In class \(#function)")
+    }
+
     override func setUp() {
         super.setUp()
         print("In \(#function)")
@@ -41,6 +47,12 @@ class SetUpTearDownTestCase: XCTestCase {
         print("In \(#function)")
         XCTAssertEqual(value, 42)
     }
+
+// CHECK: In class tearDown\(\)
+    override class func tearDown() {
+        super.tearDown()
+        print("In class \(#function)")
+    }
 }
 // CHECK: Test Suite 'SetUpTearDownTestCase' passed at \d+:\d+:\d+\.\d+
 // CHECK: \t Executed 1 test, with 0 failures \(0 unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds