Skip to content

Fixed persian calendar segmentation fault #1714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 11, 2018
Merged

Fixed persian calendar segmentation fault #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12e8f11
Fixed persian calendar segmentation fault
mohpor Oct 7, 2018
679963f
Added test case for persian calendar in TestFoundation/TestCalendar
mohpor Oct 10, 2018
1b77c68
Fixed test case in test collection.
mohpor Oct 10, 2018
c1c9df8
fixed closing quote
mohpor Oct 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CoreFoundation/Locale.subproj/CFCalendar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ CFCalendarRef CFCalendarCreateWithIdentifier(CFAllocatorRef allocator, CFStringR
else if (CFEqual(kCFIslamicCalendar, identifier)) identifier = kCFIslamicCalendar;
else if (CFEqual(kCFIslamicCivilCalendar, identifier)) identifier = kCFIslamicCivilCalendar;
else if (CFEqual(kCFHebrewCalendar, identifier)) identifier = kCFHebrewCalendar;
else if (CFEqual(kCFPersianCalendar, identifier)) identifier = kCFPersianCalendar;
else if (CFEqual(kCFISO8601Calendar, identifier)) identifier = kCFISO8601Calendar;
// else if (CFEqual(kCFChineseCalendar, identifier)) identifier = kCFChineseCalendar;
else return NULL;
Expand Down
14 changes: 14 additions & 0 deletions TestFoundation/TestCalendar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ class TestCalendar: XCTestCase {
("test_gettingDatesOnHebrewCalendar", test_gettingDatesOnHebrewCalendar ),
("test_gettingDatesOnChineseCalendar", test_gettingDatesOnChineseCalendar),
("test_gettingDatesOnISO8601Calendar", test_gettingDatesOnISO8601Calendar),
("test_gettingDatesOnPersianCalendar",
test_gettingDatesOnPersianCalendar),
("test_copy",test_copy),
("test_addingDates", test_addingDates),
("test_datesNotOnWeekend", test_datesNotOnWeekend),
Expand Down Expand Up @@ -117,6 +119,18 @@ class TestCalendar: XCTestCase {
XCTAssertEqual(components.isLeapMonth, true)
}

func test_gettingDatesOnPersianCalendar() {
let date = Date(timeIntervalSince1970: 1539146705)

var calendar = Calendar(identifier: .persian)
calendar.timeZone = TimeZone(identifier: "UTC")!
let components = calendar.dateComponents([.year, .month, .day], from: date)
XCTAssertEqual(components.year, 1397)
XCTAssertEqual(components.month, 7)
XCTAssertEqual(components.day, 18)

}

func test_ampmSymbols() {
let calendar = Calendar(identifier: .gregorian)
XCTAssertEqual(calendar.amSymbol, "AM")
Expand Down