Skip to content

Commit 74c2da4

Browse files
committed
[xctest] Check for an error message prefix only
Checking the whole message is fragile and might break should the formatting change ever so slightly. Fixes: <rdar://problem/46030955>
1 parent b883479 commit 74c2da4

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

validation-test/stdlib/XCTest.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// REQUIRES: OS=macosx
99
// UNSUPPORTED: remote_run
1010

11-
// REQUIRES: rdar46030955
12-
1311
import StdlibUnittest
1412

1513

@@ -115,7 +113,7 @@ XCTestTestSuite.test("XCTAssertEqual/T") {
115113
let failingTestRun = failingTestCase.testRun!
116114
expectEqual(1, failingTestRun.failureCount)
117115
expectEqual(0, failingTestRun.unexpectedExceptionCount)
118-
expectEqual(observer.failureDescription, "XCTAssertEqual failed: (\"1\") is not equal to (\"2\") - ")
116+
expectTrue(observer.failureDescription!.starts(with: "XCTAssertEqual failed: (\"1\") is not equal to (\"2\")"))
119117
}
120118

121119
XCTestTestSuite.test("XCTAssertEqual/Optional<T>") {
@@ -149,7 +147,7 @@ XCTestTestSuite.test("XCTAssertEqual/Optional<T>") {
149147
expectEqual(0, failingTestRun.unexpectedExceptionCount)
150148
expectEqual(1, failingTestRun.totalFailureCount)
151149
expectFalse(failingTestRun.hasSucceeded)
152-
expectEqual(observer.failureDescription, "XCTAssertEqual failed: (\"Optional(1)\") is not equal to (\"Optional(2)\") - ")
150+
expectTrue(observer.failureDescription!.starts(with: "XCTAssertEqual failed: (\"Optional(1)\") is not equal to (\"Optional(2)\")"))
153151
}
154152

155153
XCTestTestSuite.test("XCTAssertEqual/Array<T>") {

0 commit comments

Comments
 (0)