Update tests to meet the new requirements

* Add XCTestCaseType conformances and update XCTMain invocation
* Use the static allTests property

Author: briancroom

Tests/Functional/ErrorHandling/main.swift

@@ -27,7 +27,7 @@
 #endif
 
 class ErrorHandling: XCTestCase {
-    var allTests: [(String, () throws -> ())] {
+    static var allTests: [(String, ErrorHandling -> () throws -> Void)] {
         return [
             // Tests for XCTAssertThrowsError
             ("test_shouldButDoesNotThrowErrorInAssertion", test_shouldButDoesNotThrowErrorInAssertion),
@@ -39,7 +39,7 @@ class ErrorHandling: XCTestCase {
             ("test_canButDoesNotThrowErrorFromTestMethod", test_canButDoesNotThrowErrorFromTestMethod),
 
             // Tests for throwing assertion expressions
-            ("test_assertionExpressionCanThrow", test_assertionExpressionCanThrow), 
+            ("test_assertionExpressionCanThrow", test_assertionExpressionCanThrow),
         ]
     }
 
@@ -103,4 +103,4 @@ class ErrorHandling: XCTestCase {
     }
 }
 
-XCTMain([ErrorHandling()])
+XCTMain([testCase(ErrorHandling.allTests)])

Tests/Functional/FailingTestSuite/main.swift

@@ -22,7 +22,7 @@
 #endif
 
 class PassingTestCase: XCTestCase {
-    var allTests: [(String, () throws -> ())] {
+    static var allTests: [(String, PassingTestCase -> () throws -> Void)] {
         return [
             ("test_passes", test_passes),
         ]
@@ -34,7 +34,7 @@ class PassingTestCase: XCTestCase {
 }
 
 class FailingTestCase: XCTestCase {
-    var allTests: [(String, () throws -> ())] {
+    static var allTests: [(String, FailingTestCase -> () throws -> Void)] {
         return [
             ("test_passes", test_passes),
             ("test_fails", test_fails),
@@ -56,6 +56,6 @@ class FailingTestCase: XCTestCase {
 }
 
 XCTMain([
-    PassingTestCase(),
-    FailingTestCase(),
+    testCase(PassingTestCase.allTests),
+    testCase(FailingTestCase.allTests),
 ])

Tests/Functional/FailureMessagesTestCase/main.swift

@@ -78,7 +78,7 @@
 
 // Regression test for https://github.com/apple/swift-corelibs-xctest/pull/22
 class FailureMessagesTestCase: XCTestCase {
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, FailureMessagesTestCase -> () throws -> Void)] {
         return [
             ("testAssert", testAssert),
             ("testAssertEqualOptionals", testAssertEqualOptionals),
@@ -194,4 +194,4 @@ class FailureMessagesTestCase: XCTestCase {
     }
 }
 
-XCTMain([FailureMessagesTestCase()])
+XCTMain([testCase(FailureMessagesTestCase.allTests)])

Tests/Functional/NegativeAccuracyTestCase/main.swift

@@ -22,7 +22,7 @@
 
 // Regression test for https://github.com/apple/swift-corelibs-xctest/pull/7
 class NegativeAccuracyTestCase: XCTestCase {
-    var allTests: [(String, () throws -> ())] {
+    static var allTests: [(String, NegativeAccuracyTestCase -> () throws -> Void)] {
         return [
             ("test_equalWithAccuracy_passes", test_equalWithAccuracy_passes),
             ("test_equalWithAccuracy_fails", test_equalWithAccuracy_fails),
@@ -48,4 +48,4 @@ class NegativeAccuracyTestCase: XCTestCase {
     }
 }
 
-XCTMain([NegativeAccuracyTestCase()])
+XCTMain([testCase(NegativeAccuracyTestCase.allTests)])

Tests/Functional/SingleFailingTestCase/main.swift

@@ -14,9 +14,9 @@
 #endif
 
 class SingleFailingTestCase: XCTestCase {
-    var allTests: [(String, () throws -> ())] {
+    static var allTests: [(String, SingleFailingTestCase -> () throws -> Void)] {
         return [
-            ("test_fails", test_fails),
+            ("test_fails", test_fails)
         ]
     }
 
@@ -25,4 +25,4 @@ class SingleFailingTestCase: XCTestCase {
     }
 }
 
-XCTMain([SingleFailingTestCase()])
+XCTMain([testCase(SingleFailingTestCase.allTests)])

Tests/Functional/TestCaseLifecycle/main.swift

@@ -21,7 +21,7 @@
 #endif
 
 class SetUpTearDownTestCase: XCTestCase {
-    var allTests: [(String, () throws -> Void)] {
+    static var allTests: [(String, SetUpTearDownTestCase -> () throws -> Void)] {
         return [
             ("test_hasValueFromSetUp", test_hasValueFromSetUp),
         ]
@@ -47,7 +47,7 @@ class SetUpTearDownTestCase: XCTestCase {
 }
 
 class NewInstanceForEachTestTestCase: XCTestCase {
-    var allTests: [(String, () throws -> Void)] {
+    static var allTests: [(String, NewInstanceForEachTestTestCase -> () throws -> Void)] {
         return [
             ("test_hasInitializedValue", test_hasInitializedValue),
             ("test_hasInitializedValueInAnotherTest", test_hasInitializedValueInAnotherTest),
@@ -67,6 +67,6 @@ class NewInstanceForEachTestTestCase: XCTestCase {
 }
 
 XCTMain([
-    SetUpTearDownTestCase(),
-    NewInstanceForEachTestTestCase()
+    testCase(SetUpTearDownTestCase.allTests),
+    testCase(NewInstanceForEachTestTestCase.allTests)
 ])