Skip to content

[SR-10574] Add tests for new Japanese calendar era name #2200

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 1 commit into from
Mar 12, 2020
Merged

[SR-10574] Add tests for new Japanese calendar era name #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions Tests/Foundation/Tests/TestCalendar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,31 @@ class TestCalendar: XCTestCase {
XCTAssertEqual(components.day, 18)

}

func test_gettingDatesOnJapaneseCalendar() throws {
var calendar = Calendar(identifier: .japanese)
calendar.timeZone = try XCTUnwrap( TimeZone(identifier: "UTC") )
calendar.locale = Locale(identifier: "en_US_POSIX")

do {
let date = Date(timeIntervalSince1970: 1556633400) // April 30, 2019
let components = calendar.dateComponents([.era, .year, .month, .day], from: date)
XCTAssertEqual(calendar.eraSymbols[try XCTUnwrap(components.era)], "Heisei")
XCTAssertEqual(components.year, 31)
XCTAssertEqual(components.month, 4)
XCTAssertEqual(components.day, 30)
}

// Test for new Japanese calendar era (starting from May 1, 2019)
do {
let date = Date(timeIntervalSince1970: 1556719800) // May 1, 2019
let components = calendar.dateComponents([.era, .year, .month, .day], from: date)
XCTAssertEqual(calendar.eraSymbols[try XCTUnwrap(components.era)], "Reiwa")
XCTAssertEqual(components.year, 1)
XCTAssertEqual(components.month, 5)
XCTAssertEqual(components.day, 1)
}
}

func test_ampmSymbols() {
let calendar = Calendar(identifier: .gregorian)
Expand Down Expand Up @@ -249,6 +274,7 @@ class TestCalendar: XCTestCase {
("test_gettingDatesOnChineseCalendar", test_gettingDatesOnChineseCalendar),
("test_gettingDatesOnISO8601Calendar", test_gettingDatesOnISO8601Calendar),
("test_gettingDatesOnPersianCalendar", test_gettingDatesOnPersianCalendar),
("test_gettingDatesOnJapaneseCalendar", test_gettingDatesOnJapaneseCalendar),
("test_copy",test_copy),
("test_addingDates", test_addingDates),
("test_datesNotOnWeekend", test_datesNotOnWeekend),
Expand Down
31 changes: 24 additions & 7 deletions Tests/Foundation/Tests/TestDateFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,16 +430,33 @@ class TestDateFormatter: XCTestCase {

formatter.locale = Locale(identifier: "ja_JP")
formatter.calendar = Calendar(identifier: .japanese)
formatter.dateFormat = "Gy年M月dd日 HH:mm"
formatter.dateFormat = "Gy年M月d日 HH:mm"
formatter.timeZone = TimeZone(abbreviation: "JST")

// parse test
let parsed = formatter.date(from: "平成31年4月30日 23:10")
XCTAssertEqual(parsed?.timeIntervalSince1970, 1556633400) // April 30, 2019, 11:10 PM (JST)
do {
// Parse test
let parsed = formatter.date(from: "平成31年4月30日 23:10")
XCTAssertEqual(parsed?.timeIntervalSince1970, 1556633400) // April 30, 2019, 11:10 PM (JST)

// Format test
let dateString = formatter.string(from: Date(timeIntervalSince1970: 1556633400)) // April 30, 2019, 11:10 PM (JST)
XCTAssertEqual(dateString, "平成31年4月30日 23:10")
}

// format test
let dateString = formatter.string(from: Date(timeIntervalSince1970: 1556633400)) // April 30, 2019, 11:10 PM (JST)
XCTAssertEqual(dateString, "平成31年4月30日 23:10")
// Test for new Japanese era (starting from May 1, 2019)
do {
// Parse test
let parsed = formatter.date(from: "令和1年5月1日 23:10")
XCTAssertEqual(parsed?.timeIntervalSince1970, 1556719800) // May 1st, 2019, 11:10 PM (JST)

// Test for 元年(Gannen) representaion of 1st year
let parsedAlt = formatter.date(from: "令和元年5月1日 23:10")
XCTAssertEqual(parsedAlt?.timeIntervalSince1970, 1556719800) // May 1st, 2019, 11:10 PM (JST)

// Format test
let dateString = formatter.string(from: Date(timeIntervalSince1970: 1556719800)) // May 1st, 2019, 11:10 PM (JST)
XCTAssertEqual(dateString, "令和元年5月1日 23:10")
}
}

func test_orderOfPropertySetters() throws {
Expand Down