Add support for unexpected failures

An “unexpected failure” is a failure that wasn’t accounted for by an assertion.

Author: eschaton

XCTest/XCTAssert.swift

@@ -20,7 +20,7 @@ The primitive assertion function for XCTest. All other XCTAssert* functions are
 public func XCTAssert(@autoclosure expression: () -> BooleanType, _ message: String = "", file: StaticString = __FILE__, line: UInt = __LINE__) {
     if !expression().boolValue {
         if let test = XCTCurrentTestCase {
-            test.testFailure(message, file: file, line: line)
+            test.testFailure(message, expected: true, file: file, line: line)
         }
     }
 }

XCTest/XCTest.swift

@@ -20,11 +20,12 @@ import Darwin
 
 struct XCTFailure {
     var message: String
+    var expected: Bool
     var file: StaticString
     var line: UInt
 
     func emit(method: String) {
-        print("\(file):\(line): error: \(method) : \(message)")
+        print("\(file):\(line): \(expected ? "" : "unexpected ")error: \(method) : \(message)")
     }
 }
 
@@ -33,6 +34,9 @@ internal struct XCTRun {
     var method: String
     var passed: Bool
     var failures: [XCTFailure]
+    var unexpectedFailures: [XCTFailure] {
+        get { return failures.filter({ failure -> Bool in failure.expected == false }) }
+    }
 }
 
 /// Starts a test run for the specified test cases.
@@ -43,7 +47,7 @@ internal struct XCTRun {
     for testCase in testCases {
         testCase.invokeTest()
     }
-    let (totalDuration, totalFailures) = XCTAllRuns.reduce((0.0, 0)) { ($0.0 + $1.duration, $0.1 + $1.failures.count) }
+    let (totalDuration, totalFailures, totalUnexpectedFailures) = XCTAllRuns.reduce((0.0, 0, 0)) { totals, run in (totals.0 + run.duration, totals.1 + run.failures.count, totals.2 + run.unexpectedFailures.count) }
 
     var testCountSuffix = "s"
     if XCTAllRuns.count == 1 {
@@ -54,7 +58,7 @@ internal struct XCTRun {
         failureSuffix = ""
     }
     let averageDuration = totalDuration / Double(XCTAllRuns.count)
-    print("Total executed \(XCTAllRuns.count) test\(testCountSuffix), with \(totalFailures) failure\(failureSuffix) (0 unexpected) in \(round(averageDuration * 1000.0) / 1000.0) (\(round(totalDuration * 1000.0) / 1000.0)) seconds")
+    print("Total executed \(XCTAllRuns.count) test\(testCountSuffix), with \(totalFailures) failure\(failureSuffix) (\(totalUnexpectedFailures) unexpected) in \(round(averageDuration * 1000.0) / 1000.0) (\(round(totalDuration * 1000.0) / 1000.0)) seconds")
     exit(totalFailures > 0 ? 1 : 0)
 }
 

XCTest/XCTestCase.swift

@@ -36,6 +36,7 @@ extension XCTestCase {
         let tests = self.allTests
         var totalDuration = 0.0
         var totalFailures = 0
+        var unexpectedFailures = 0
         for (name, test) in tests {
             XCTCurrentTestCase = self
             let method = "\(self.dynamicType).\(name)"
@@ -57,6 +58,9 @@ extension XCTestCase {
             for failure in XCTCurrentFailures {
                 failure.emit(method)
                 totalFailures++
+                if failure.expected == false {
+                    unexpectedFailures++
+                }
             }
             var result = "passed"
             if XCTCurrentFailures.count > 0 {
@@ -78,15 +82,15 @@ extension XCTestCase {
         let averageDuration = totalDuration / Double(tests.count)
 
 
-        print("Executed \(tests.count) test\(testCountSuffix), with \(totalFailures) failure\(failureSuffix) (0 unexpected) in \(round(averageDuration * 1000.0) / 1000.0) (\(round(totalDuration * 1000.0) / 1000.0)) seconds")
+        print("Executed \(tests.count) test\(testCountSuffix), with \(totalFailures) failure\(failureSuffix) \(unexpectedFailures) unexpected) in \(round(averageDuration * 1000.0) / 1000.0) (\(round(totalDuration * 1000.0) / 1000.0)) seconds")
     }
 
     // This function is for the use of XCTestCase only, but we must make it public or clients will get a link failure when using XCTest (23476006)
-    public func testFailure(message: String, file: StaticString , line: UInt) {
+    public func testFailure(message: String, expected: Bool, file: StaticString , line: UInt) {
         if !continueAfterFailure {
             assert(false, message, file: file, line: line)
         } else {
-            XCTCurrentFailures.append(XCTFailure(message: message, file: file, line: line))
+            XCTCurrentFailures.append(XCTFailure(message: message, expected: expected, file: file, line: line))
         }
     }