@@ -79,12 +79,12 @@ class TestDateFormatter: XCTestCase {
79
79
func test_dateStyleShort() {
80
80
81
81
let timestamps = [
82
- -31536000 : "1/1/69, 12:00 AM" , 0.0 : "1/1/70, 12:00 AM", 31536000 : "1/1/71, 12:00 AM",
83
- 2145916800 : "1/1/38, 12:00 AM", 1456272000 : "2/24/16, 12:00 AM", 1456358399 : "2/24/16, 11:59 PM",
84
- 1452574638 : "1/12/16, 4:57 AM", 1455685038 : "2/17/16, 4:57 AM", 1458622638 : "3/22/16, 4:57 AM",
85
- 1459745838 : "4/4/16, 4:57 AM", 1462597038 : "5/7/16, 4:57 AM", 1465534638 : "6/10/16, 4:57 AM",
86
- 1469854638 : "7/30/16, 4:57 AM", 1470718638 : "8/9/16, 4:57 AM", 1473915438 : "9/15/16, 4:57 AM",
87
- 1477285038 : "10/24/16, 4:57 AM", 1478062638 : "11/2/16, 4:57 AM", 1482641838 : "12/25/16, 4:57 AM"
82
+ -31536000 : "1/1/69, 12:00 AM" , 0.0 : "1/1/70, 12:00 AM", 31536000 : "1/1/71, 12:00 AM",
83
+ 2145916800 : "1/1/38, 12:00 AM", 1456272000 : "2/24/16, 12:00 AM", 1456358399 : "2/24/16, 11:59 PM",
84
+ 1452574638 : "1/12/16, 4:57 AM", 1455685038 : "2/17/16, 4:57 AM", 1458622638 : "3/22/16, 4:57 AM",
85
+ 1459745838 : "4/4/16, 4:57 AM", 1462597038 : "5/7/16, 4:57 AM", 1465534638 : "6/10/16, 4:57 AM",
86
+ 1469854638 : "7/30/16, 4:57 AM", 1470718638 : "8/9/16, 4:57 AM", 1473915438 : "9/15/16, 4:57 AM",
87
+ 1477285038 : "10/24/16, 4:57 AM", 1478062638 : "11/2/16, 4:57 AM", 1482641838 : "12/25/16, 4:57 AM"
88
88
]
89
89
90
90
let f = DateFormatter()
@@ -100,7 +100,7 @@ class TestDateFormatter: XCTestCase {
100
100
let testDate = Date(timeIntervalSince1970: timestamp)
101
101
let sf = f.string(from: testDate)
102
102
103
- XCTAssertEqual(sf, stringResult)
103
+ XCTAssertEqual(sf.normalizingICUSeparator() , stringResult)
104
104
}
105
105
106
106
}
@@ -145,12 +145,12 @@ class TestDateFormatter: XCTestCase {
145
145
func test_dateStyleLong() {
146
146
147
147
let timestamps = [
148
- -31536000 : "January 1, 1969 at 12:00:00 AM GMT" , 0.0 : "January 1, 1970 at 12:00:00 AM GMT", 31536000 : "January 1, 1971 at 12:00:00 AM GMT",
149
- 2145916800 : "January 1, 2038 at 12:00:00 AM GMT", 1456272000 : "February 24, 2016 at 12:00:00 AM GMT", 1456358399 : "February 24, 2016 at 11:59:59 PM GMT",
150
- 1452574638 : "January 12, 2016 at 4:57:18 AM GMT", 1455685038 : "February 17, 2016 at 4:57:18 AM GMT", 1458622638 : "March 22, 2016 at 4:57:18 AM GMT",
151
- 1459745838 : "April 4, 2016 at 4:57:18 AM GMT", 1462597038 : "May 7, 2016 at 4:57:18 AM GMT", 1465534638 : "June 10, 2016 at 4:57:18 AM GMT",
152
- 1469854638 : "July 30, 2016 at 4:57:18 AM GMT", 1470718638 : "August 9, 2016 at 4:57:18 AM GMT", 1473915438 : "September 15, 2016 at 4:57:18 AM GMT",
153
- 1477285038 : "October 24, 2016 at 4:57:18 AM GMT", 1478062638 : "November 2, 2016 at 4:57:18 AM GMT", 1482641838 : "December 25, 2016 at 4:57:18 AM GMT"
148
+ -31536000 : "January 1, 1969 at 12:00:00 AM GMT" , 0.0 : "January 1, 1970 at 12:00:00 AM GMT", 31536000 : "January 1, 1971 at 12:00:00 AM GMT",
149
+ 2145916800 : "January 1, 2038 at 12:00:00 AM GMT", 1456272000 : "February 24, 2016 at 12:00:00 AM GMT", 1456358399 : "February 24, 2016 at 11:59:59 PM GMT",
150
+ 1452574638 : "January 12, 2016 at 4:57:18 AM GMT", 1455685038 : "February 17, 2016 at 4:57:18 AM GMT", 1458622638 : "March 22, 2016 at 4:57:18 AM GMT",
151
+ 1459745838 : "April 4, 2016 at 4:57:18 AM GMT", 1462597038 : "May 7, 2016 at 4:57:18 AM GMT", 1465534638 : "June 10, 2016 at 4:57:18 AM GMT",
152
+ 1469854638 : "July 30, 2016 at 4:57:18 AM GMT", 1470718638 : "August 9, 2016 at 4:57:18 AM GMT", 1473915438 : "September 15, 2016 at 4:57:18 AM GMT",
153
+ 1477285038 : "October 24, 2016 at 4:57:18 AM GMT", 1478062638 : "November 2, 2016 at 4:57:18 AM GMT", 1482641838 : "December 25, 2016 at 4:57:18 AM GMT"
154
154
]
155
155
156
156
let f = DateFormatter()
@@ -164,7 +164,7 @@ class TestDateFormatter: XCTestCase {
164
164
let testDate = Date(timeIntervalSince1970: timestamp)
165
165
let sf = f.string(from: testDate)
166
166
167
- XCTAssertEqual(sf, stringResult)
167
+ XCTAssertEqual(sf.normalizingICUSeparator() , stringResult)
168
168
}
169
169
170
170
}
@@ -282,37 +282,37 @@ class TestDateFormatter: XCTestCase {
282
282
283
283
let formats: [String: (DateFormatter.Style, DateFormatter.Style)] = [
284
284
"": (.none, .none),
285
- "h:mm a": (.none, .short),
286
- "h:mm:ss a": (.none, .medium),
287
- "h:mm:ss a z": (.none, .long),
288
- "h:mm:ss a zzzz": (.none, .full),
285
+ "h:mm a": (.none, .short),
286
+ "h:mm:ss a": (.none, .medium),
287
+ "h:mm:ss a z": (.none, .long),
288
+ "h:mm:ss a zzzz": (.none, .full),
289
289
"M/d/yy": (.short, .none),
290
- "M/d/yy, h:mm a": (.short, .short),
291
- "M/d/yy, h:mm:ss a": (.short, .medium),
292
- "M/d/yy, h:mm:ss a z": (.short, .long),
293
- "M/d/yy, h:mm:ss a zzzz": (.short, .full),
290
+ "M/d/yy, h:mm a": (.short, .short),
291
+ "M/d/yy, h:mm:ss a": (.short, .medium),
292
+ "M/d/yy, h:mm:ss a z": (.short, .long),
293
+ "M/d/yy, h:mm:ss a zzzz": (.short, .full),
294
294
"MMM d, y": (.medium, .none),
295
- "MMM d, y 'at' h:mm a": (.medium, .short),
296
- "MMM d, y 'at' h:mm:ss a": (.medium, .medium),
297
- "MMM d, y 'at' h:mm:ss a z": (.medium, .long),
298
- "MMM d, y 'at' h:mm:ss a zzzz": (.medium, .full),
295
+ "MMM d, y 'at' h:mm a": (.medium, .short),
296
+ "MMM d, y 'at' h:mm:ss a": (.medium, .medium),
297
+ "MMM d, y 'at' h:mm:ss a z": (.medium, .long),
298
+ "MMM d, y 'at' h:mm:ss a zzzz": (.medium, .full),
299
299
"MMMM d, y": (.long, .none),
300
- "MMMM d, y 'at' h:mm a": (.long, .short),
301
- "MMMM d, y 'at' h:mm:ss a": (.long, .medium),
302
- "MMMM d, y 'at' h:mm:ss a z": (.long, .long),
303
- "MMMM d, y 'at' h:mm:ss a zzzz": (.long, .full),
300
+ "MMMM d, y 'at' h:mm a": (.long, .short),
301
+ "MMMM d, y 'at' h:mm:ss a": (.long, .medium),
302
+ "MMMM d, y 'at' h:mm:ss a z": (.long, .long),
303
+ "MMMM d, y 'at' h:mm:ss a zzzz": (.long, .full),
304
304
"EEEE, MMMM d, y": (.full, .none),
305
- "EEEE, MMMM d, y 'at' h:mm a": (.full, .short),
306
- "EEEE, MMMM d, y 'at' h:mm:ss a": (.full, .medium),
307
- "EEEE, MMMM d, y 'at' h:mm:ss a z": (.full, .long),
308
- "EEEE, MMMM d, y 'at' h:mm:ss a zzzz": (.full, .full),
305
+ "EEEE, MMMM d, y 'at' h:mm a": (.full, .short),
306
+ "EEEE, MMMM d, y 'at' h:mm:ss a": (.full, .medium),
307
+ "EEEE, MMMM d, y 'at' h:mm:ss a z": (.full, .long),
308
+ "EEEE, MMMM d, y 'at' h:mm:ss a zzzz": (.full, .full),
309
309
]
310
310
311
311
for (dateFormat, styles) in formats {
312
312
f.dateStyle = styles.0
313
313
f.timeStyle = styles.1
314
314
315
- XCTAssertEqual(f.dateFormat!, dateFormat)
315
+ XCTAssertEqual(f.dateFormat!.normalizingICUSeparator() , dateFormat)
316
316
}
317
317
}
318
318
0 commit comments