Merge pull request #149 from dduan/se0110-a

Updates for SE-0110 Part I

Author: CodaFi

Sources/XCTest/Private/TestFiltering.swift

@@ -28,17 +28,17 @@ internal struct TestFiltering {
     }
 
     private func excludeAllFilter() -> TestFilter {
-        return { _ in false }
+        return { _, _ in false }
     }
 
     private func includeAllFilter() -> TestFilter {
-        return { _ in true }
+        return { _, _ in true }
     }
 
     static func filterTests(_ entries: [XCTestCaseEntry], filter: TestFilter) -> [XCTestCaseEntry] {
         return entries
             .map { testCaseClass, testCaseMethods in
-                return (testCaseClass, testCaseMethods.filter { filter(testCaseClass, $0.0) } )
+                return (testCaseClass, testCaseMethods.filter { s, _ in filter(testCaseClass, s) } )
             }
             .filter { _, testCaseMethods in
                 return !testCaseMethods.isEmpty

Sources/XCTest/Public/XCTestCase.swift

@@ -165,14 +165,14 @@ public class XCTestCase: XCTest {
 /// the signature required by `XCTMain`
 /// - seealso: `XCTMain`
 public func testCase<T: XCTestCase>(_ allTests: [(String, (T) -> () throws -> Void)]) -> XCTestCaseEntry {
-    let tests: [(String, (XCTestCase) throws -> Void)] = allTests.map { ($0.0, test($0.1)) }
+    let tests: [(String, (XCTestCase) throws -> Void)] = allTests.map { ($0, test($1)) }
     return (T.self, tests)
 }
 
 /// Wrapper function for the non-throwing variant of tests.
 /// - seealso: `XCTMain`
 public func testCase<T: XCTestCase>(_ allTests: [(String, (T) -> () -> Void)]) -> XCTestCaseEntry {
-    let tests: [(String, (XCTestCase) throws -> Void)] = allTests.map { ($0.0, test($0.1)) }
+    let tests: [(String, (XCTestCase) throws -> Void)] = allTests.map { ($0, test($1)) }
     return (T.self, tests)
 }
 

Tests/Functional/Asynchronous/Predicates/Handler/main.swift

@@ -20,7 +20,7 @@ class PredicateHandlerTestCase: XCTestCase {
     func test_predicateIsTrue_handlerReturnsTrue_passes() {
         let predicate = Predicate(value: true)
         let object = NSObject()
-        self.expectation(for: predicate, evaluatedWith: object, handler: { _ in
+        self.expectation(for: predicate, evaluatedWith: object, handler: {
             return true
         })
         waitForExpectations(timeout: 0.1)
@@ -31,7 +31,7 @@ class PredicateHandlerTestCase: XCTestCase {
     func test_predicateIsTrue_handlerReturnsFalse_fails() {
         let predicate = Predicate(value: true)
         let object = NSObject()
-        self.expectation(for: predicate, evaluatedWith: object, handler: { _ in
+        self.expectation(for: predicate, evaluatedWith: object, handler: {
             return false
         })
         waitForExpectations(timeout: 0.1)
@@ -48,7 +48,7 @@ class PredicateHandlerTestCase: XCTestCase {
             }
             return false
         })
-        expectation(for: predicate, evaluatedWith: halfSecLaterDate, handler: { _ in
+        expectation(for: predicate, evaluatedWith: halfSecLaterDate, handler: {
             XCTFail("Should not call the predicate expectation handler")
             return true
         })