Refactor the test

Author: novi

TestFoundation/TestCalendar.swift

@@ -133,14 +133,15 @@ class TestCalendar: XCTestCase {
 
     }
 
-    func test_gettingDatesOnJapaneseCalendar() {
+    func test_gettingDatesOnJapaneseCalendar() throws {
         var calendar = Calendar(identifier: .japanese)
-        calendar.timeZone = TimeZone(identifier: "UTC")!
+        calendar.timeZone = try TimeZone(identifier: "UTC").unwrapped()
+        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[components.era!], "Heisei")
+            XCTAssertEqual(calendar.eraSymbols[try components.era.unwrapped()], "Heisei")
             XCTAssertEqual(components.year, 31)
             XCTAssertEqual(components.month, 4)
             XCTAssertEqual(components.day, 30)
@@ -150,7 +151,7 @@ class TestCalendar: XCTestCase {
         do {
             let date = Date(timeIntervalSince1970: 1556719800) // May 1, 2019
             let components = calendar.dateComponents([.era, .year, .month, .day], from: date)
-            XCTAssertEqual(calendar.eraSymbols[components.era!], "Reiwa")
+            XCTAssertEqual(calendar.eraSymbols[try components.era.unwrapped()], "Reiwa")
             XCTAssertEqual(components.year, 1)
             XCTAssertEqual(components.month, 5)
             XCTAssertEqual(components.day, 1)

TestFoundation/TestDateFormatter.swift

@@ -456,21 +456,18 @@ class TestDateFormatter: XCTestCase {
             XCTAssertEqual(dateString, "令和1年5月1日 23:10")
         }
 
-        // Test for new Japanese era and 元年 representaion of 1st year
-        // This block needs ICU 64.2
-        
-// Disabled until the ICU is updated.
-//        do {
-//            // parse test
-//            let parsed = formatter.date(from: "令和元年5月1日 23:10")
-//            XCTAssertEqual(parsed?.timeIntervalSince1970, 1556719800) // May 1st, 2019, 11:10 PM (JST)
-//
-//            let parsedAlt = formatter.date(from: "令和1年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")
-//        }
+        // Test for new Japanese era and 元年(Gannen) representaion of 1st year
+        if shouldAttemptXFailTests("These tests require ICU 64.2 or later. https://bugs.swift.org/browse/SR-10574") {
+            // parse test
+            let parsed = formatter.date(from: "令和元年5月1日 23:10")
+            XCTAssertEqual(parsed?.timeIntervalSince1970, 1556719800) // May 1st, 2019, 11:10 PM (JST)
+
+            let parsedAlt = formatter.date(from: "令和1年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")
+        }
     }
 }