From a7121192af8bd66b4f91eb954975b1d1400f08e5 Mon Sep 17 00:00:00 2001 From: zhongwuzw Date: Tue, 2 Jan 2018 23:12:19 +0800 Subject: [PATCH] Fix tests failure when last week is the last year --- Tests/ModelTests/MessageKitDateFormatterTests.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Tests/ModelTests/MessageKitDateFormatterTests.swift b/Tests/ModelTests/MessageKitDateFormatterTests.swift index 4a66cec2..094070c8 100644 --- a/Tests/ModelTests/MessageKitDateFormatterTests.swift +++ b/Tests/ModelTests/MessageKitDateFormatterTests.swift @@ -93,7 +93,13 @@ class MessageKitDateFormatterTests: XCTestCase { ///Day of last week startOfWeek = (Calendar.current as NSCalendar).date(byAdding: .day, value: -2, to: startOfWeek, options: [])! - formatter.dateFormat = "E, d MMM, h:mm a" + + if Calendar.current.isDate(startOfWeek, equalTo: Date(), toGranularity: .year) { + formatter.dateFormat = "E, d MMM, h:mm a" + } else { + formatter.dateFormat = "MMM d, yyyy, h:mm a" + } + XCTAssertEqual(MessageKitDateFormatter.shared.string(from: startOfWeek), formatter.string(from: startOfWeek)) }