From 75b23ba6a8aa770ed1f1c5e7358cef5beb38de85 Mon Sep 17 00:00:00 2001 From: Maxim Moiseev Date: Tue, 13 Nov 2018 14:34:15 -0800 Subject: [PATCH] [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: (cherry picked from commit 74c2da4c4b313fa660dc7b2fb43e74e83df90a15) --- validation-test/stdlib/XCTest.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validation-test/stdlib/XCTest.swift b/validation-test/stdlib/XCTest.swift index f409a9eedc08c..62c491228ec4c 100644 --- a/validation-test/stdlib/XCTest.swift +++ b/validation-test/stdlib/XCTest.swift @@ -113,7 +113,7 @@ XCTestTestSuite.test("XCTAssertEqual/T") { let failingTestRun = failingTestCase.testRun! expectEqual(1, failingTestRun.failureCount) expectEqual(0, failingTestRun.unexpectedExceptionCount) - expectEqual(observer.failureDescription, "XCTAssertEqual failed: (\"1\") is not equal to (\"2\") - ") + expectTrue(observer.failureDescription!.starts(with: "XCTAssertEqual failed: (\"1\") is not equal to (\"2\")")) } XCTestTestSuite.test("XCTAssertEqual/Optional") { @@ -147,7 +147,7 @@ XCTestTestSuite.test("XCTAssertEqual/Optional") { expectEqual(0, failingTestRun.unexpectedExceptionCount) expectEqual(1, failingTestRun.totalFailureCount) expectFalse(failingTestRun.hasSucceeded) - expectEqual(observer.failureDescription, "XCTAssertEqual failed: (\"Optional(1)\") is not equal to (\"Optional(2)\") - ") + expectTrue(observer.failureDescription!.starts(with: "XCTAssertEqual failed: (\"Optional(1)\") is not equal to (\"Optional(2)\")")) } XCTestTestSuite.test("XCTAssertEqual/Array") {