From 1cf376e7e5d15b7d5b81ee9f4b4283daf5491765 Mon Sep 17 00:00:00 2001 From: Alexander Smarus Date: Mon, 27 Apr 2020 17:54:04 +0300 Subject: [PATCH] Adjust test_dateFromDoesntMutate expectations CI runs in UTC time zone, and this affects the description of TimeZone being tested. --- Tests/Foundation/Tests/TestCalendar.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Tests/Foundation/Tests/TestCalendar.swift b/Tests/Foundation/Tests/TestCalendar.swift index 1db66d2e47..df839d384e 100644 --- a/Tests/Foundation/Tests/TestCalendar.swift +++ b/Tests/Foundation/Tests/TestCalendar.swift @@ -244,18 +244,20 @@ class TestCalendar: XCTestCase { calendar.locale = Locale(identifier: "en_US_POSIX") calendar.timeZone = try XCTUnwrap(TimeZone(secondsFromGMT: 0)) + let expectedDescription = calendar.timeZone == TimeZone.current ? "GMT (current)" : "GMT (fixed)" + let calendarCopy = calendar XCTAssertEqual(calendarCopy.timeZone.identifier, "GMT") - XCTAssertEqual(calendarCopy.timeZone.description, "GMT (fixed)") + XCTAssertEqual(calendarCopy.timeZone.description, expectedDescription) let dc = try calendarCopy.dateComponents(in: XCTUnwrap(TimeZone(identifier: "America/New_York")), from: XCTUnwrap(df.date(from: "2019-01-01"))) XCTAssertEqual(calendarCopy.timeZone.identifier, "GMT") - XCTAssertEqual(calendarCopy.timeZone.description, "GMT (fixed)") + XCTAssertEqual(calendarCopy.timeZone.description, expectedDescription) let dt = try XCTUnwrap(calendarCopy.date(from: dc)) XCTAssertEqual(dt.description, "2019-01-01 00:00:00 +0000") XCTAssertEqual(calendarCopy.timeZone.identifier, "GMT") - XCTAssertEqual(calendarCopy.timeZone.description, "GMT (fixed)") + XCTAssertEqual(calendarCopy.timeZone.description, expectedDescription) XCTAssertEqual(calendarCopy.timeZone, calendar.timeZone) XCTAssertEqual(calendarCopy, calendar) }