Skip to content

Commit 023d464

Browse files
committed
Merge pull request #153 from brownleej/calendar-time-zone-fix
Forces the tests for calendar date conversion to use UTC instead of system time.
2 parents f85490d + 91650c8 commit 023d464

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

TestFoundation/TestNSCalendar.swift

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@ class TestNSCalendar: XCTestCase {
3030
func test_gettingDatesOnGregorianCalendar() {
3131
let date = NSDate(timeIntervalSince1970: 1449332351)
3232

33-
guard let components = NSCalendar(calendarIdentifier: NSCalendarIdentifierGregorian)?.components([.Year, .Month, .Day], fromDate: date) else {
34-
XCTFail("Could not get date from the gregorian calendar")
33+
let calendar = NSCalendar(calendarIdentifier: NSCalendarIdentifierGregorian)
34+
calendar?.timeZone = NSTimeZone(name: "UTC")!
35+
guard let components = calendar?.components([.Year, .Month, .Day], fromDate: date) else {
36+
XCTFail("Could not get date from the calendar")
3537
return
3638
}
39+
3740
XCTAssertEqual(components.year, 2015)
3841
XCTAssertEqual(components.month, 12)
3942
XCTAssertEqual(components.day, 5)
@@ -42,7 +45,9 @@ class TestNSCalendar: XCTestCase {
4245
func test_gettingDatesOnHebrewCalendar() {
4346
let date = NSDate(timeIntervalSince1970: 1552580351)
4447

45-
guard let components = NSCalendar(calendarIdentifier: NSCalendarIdentifierHebrew)?.components([.Year, .Month, .Day], fromDate: date) else {
48+
let calendar = NSCalendar(calendarIdentifier: NSCalendarIdentifierHebrew)
49+
calendar?.timeZone = NSTimeZone(name: "UTC")!
50+
guard let components = calendar?.components([.Year, .Month, .Day], fromDate: date) else {
4651
XCTFail("Could not get date from the Hebrew calendar")
4752
return
4853
}
@@ -55,7 +60,9 @@ class TestNSCalendar: XCTestCase {
5560
func test_gettingDatesOnChineseCalendar() {
5661
let date = NSDate(timeIntervalSince1970: 1591460351.0)
5762

58-
guard let components = NSCalendar(calendarIdentifier: NSCalendarIdentifierChinese)?.components([.Year, .Month, .Day], fromDate: date) else {
63+
let calendar = NSCalendar(calendarIdentifier: NSCalendarIdentifierChinese)
64+
calendar?.timeZone = NSTimeZone(name: "UTC")!
65+
guard let components = calendar?.components([.Year, .Month, .Day], fromDate: date) else {
5966
XCTFail("Could not get date from the Chinese calendar")
6067
return
6168
}

0 commit comments

Comments
 (0)