Skip to content

Commit ef71de2

Browse files
committed
[XCTestCase] Fix total number of tests output
#33 introduced another regression that was not fixed in 4944003: the total number of test runs was not being reported correctly--only the total number of failures. Fix the misreporting, as well as the incorrect verification in the `FailingTestSuite` functional test.
1 parent 78d7553 commit ef71de2

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Sources/XCTest/XCTestCase.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@ extension XCTestCase {
6363
if !failure.expected {
6464
unexpectedFailures += 1
6565
}
66-
6766
result = failures.count > 0 ? "failed" : "passed"
68-
XCTAllRuns.append(XCTRun(duration: duration, method: method, passed: failures.count == 0, failures: failures))
6967
}
7068

7169
print("Test Case '\(method)' \(result) (\(printableStringForTimeInterval(duration)) seconds).")
70+
XCTAllRuns.append(XCTRun(duration: duration, method: method, passed: failures.count == 0, failures: failures))
7271
XCTFailureHandler = nil
7372
}
7473
}

Tests/Functional/FailingTestSuite/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// CHECK: .*/Tests/Functional/FailingTestSuite/main.swift:54: error: FailingTestCase.test_fails_with_message : XCTAssertTrue failed - Foo bar.
1414
// CHECK: Test Case 'FailingTestCase.test_fails_with_message' failed \(\d+\.\d+ seconds\).
1515
// CHECK: Executed 3 tests, with 2 failures \(0 unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds
16-
// CHECK: Total executed 2 tests, with 2 failures \(0 unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds
16+
// CHECK: Total executed 4 tests, with 2 failures \(0 unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds
1717

1818
#if os(Linux) || os(FreeBSD)
1919
import XCTest

0 commit comments

Comments
 (0)