@@ -59,15 +59,12 @@ class TestNumberFormatter: XCTestCase {
59
59
}
60
60
61
61
func test_currencyCode( ) {
62
- // Disabled due to [SR-250]
63
- /*
64
62
let numberFormatter = NumberFormatter ( )
65
- numberFormatter.numberStyle = .CurrencyStyle
63
+ numberFormatter. numberStyle = . currency
66
64
numberFormatter. currencyCode = " T "
67
65
numberFormatter. currencyDecimalSeparator = " _ "
68
- let formattedString = numberFormatter.stringFromNumber(42)
69
- XCTAssertEqual(formattedString, "T 42_00")
70
- */
66
+ let formattedString = numberFormatter. string ( from: 42 )
67
+ XCTAssertEqual ( formattedString, " T42_00 " )
71
68
}
72
69
73
70
func test_decimalSeparator( ) {
@@ -83,15 +80,12 @@ class TestNumberFormatter: XCTestCase {
83
80
}
84
81
85
82
func test_currencyDecimalSeparator( ) {
86
- // Disabled due to [SR-250]
87
- /*
88
83
let numberFormatter = NumberFormatter ( )
89
- numberFormatter.numberStyle = .CurrencyStyle
84
+ numberFormatter. numberStyle = . currency
90
85
numberFormatter. currencyDecimalSeparator = " - "
91
86
numberFormatter. currencyCode = " T "
92
- let formattedString = numberFormatter.stringFromNumber(42.42)
93
- XCTAssertEqual(formattedString, "T 42-42")
94
- */
87
+ let formattedString = numberFormatter. string ( from: 42.42 )
88
+ XCTAssertEqual ( formattedString, " T42-42 " )
95
89
}
96
90
97
91
func test_alwaysShowDecimalSeparator( ) {
@@ -191,15 +185,12 @@ class TestNumberFormatter: XCTestCase {
191
185
}
192
186
193
187
func test_currencySymbol( ) {
194
- // Disabled due to [SR-250]
195
- /*
196
188
let numberFormatter = NumberFormatter ( )
197
- numberFormatter.numberStyle = .CurrencyStyle
189
+ numberFormatter. numberStyle = . currency
198
190
numberFormatter. currencySymbol = " 🍯 "
199
191
numberFormatter. currencyDecimalSeparator = " _ "
200
- let formattedString = numberFormatter.stringFromNumber(42)
201
- XCTAssertEqual(formattedString, "🍯 42_00")
202
- */
192
+ let formattedString = numberFormatter. string ( from: 42 )
193
+ XCTAssertEqual ( formattedString, " 🍯42_00 " )
203
194
}
204
195
205
196
func test_exponentSymbol( ) {
@@ -527,28 +518,26 @@ class TestNumberFormatter: XCTestCase {
527
518
}
528
519
529
520
func test_internationalCurrencySymbol( ) {
530
- // Disabled due to [SR-250]
531
- /*
521
+ // What does internationalCurrencySymbol actually do?
522
+ #if false
532
523
let numberFormatter = NumberFormatter ( )
533
- numberFormatter.numberStyle = .CurrencyPluralStyle
524
+ numberFormatter. numberStyle = . currencyPlural
534
525
numberFormatter. internationalCurrencySymbol = " 💵 "
535
526
numberFormatter. currencyDecimalSeparator = " _ "
536
- let formattedString = numberFormatter.stringFromNumber( 42)
537
- XCTAssertEqual(formattedString, "💵 42_00")
538
- */
527
+ let formattedString = numberFormatter. string ( from : 42 )
528
+ XCTAssertEqual ( formattedString, " 💵42_00 " )
529
+ #endif
539
530
}
540
531
541
532
func test_currencyGroupingSeparator( ) {
542
- // Disabled due to [SR-250]
543
- /*
544
533
let numberFormatter = NumberFormatter ( )
545
- numberFormatter.numberStyle = .CurrencyStyle
534
+ numberFormatter. numberStyle = . currency
546
535
numberFormatter. currencyGroupingSeparator = " _ "
547
536
numberFormatter. currencyCode = " T "
548
537
numberFormatter. currencyDecimalSeparator = " / "
549
- let formattedString = numberFormatter.stringFromNumber( 42_000)
550
- XCTAssertEqual(formattedString, "T 42_000 /00")
551
- */
538
+ let formattedString = numberFormatter. string ( from : 42_000 )
539
+ XCTAssertEqual ( formattedString, " T42_000 /00" )
540
+
552
541
}
553
542
554
543
func test_lenient( ) {
@@ -569,13 +558,14 @@ class TestNumberFormatter: XCTestCase {
569
558
XCTAssertEqual ( number, 2.22 )
570
559
571
560
// TODO: Add some tests with currency after [SR-250] resolved
572
- // numberFormatter.numberStyle = .currency
573
- // let nilNumberBeforeLenient = numberFormatter.number(from: "42")
574
- //
575
- // XCTAssertNil(nilNumberBeforeLenient)
576
- // numberFormatter.isLenient = true
577
- // let numberAfterLenient = numberFormatter.number(from: "42.42")
578
- // XCTAssertEqual(numberAfterLenient, 42.42)
561
+ numberFormatter. numberStyle = . currency
562
+ numberFormatter. isLenient = false
563
+ let nilNumberBeforeLenient = numberFormatter. number ( from: " 42 " )
564
+
565
+ XCTAssertNil ( nilNumberBeforeLenient)
566
+ numberFormatter. isLenient = true
567
+ let numberAfterLenient = numberFormatter. number ( from: " 42.42 " )
568
+ XCTAssertEqual ( numberAfterLenient, 42.42 )
579
569
}
580
570
581
571
func test_minimumSignificantDigits( ) {
@@ -683,4 +673,3 @@ class TestNumberFormatter: XCTestCase {
683
673
XCTAssertEqual ( numberFormatter. paddingCharacter, " " )
684
674
}
685
675
}
686
-
0 commit comments