Set appropriate default properties for decimal number style, and adde…

…d tests.
jsubida · Dec 11, 2016 · 74e880e · 74e880e
1 parent 173e9ea
commit 74e880e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Foundation/NSNumberFormatter.swift b/Foundation/NSNumberFormatter.swift
@@ -192,6 +192,12 @@ open class NumberFormatter : Formatter {
                 _usesGroupingSeparator = true
                 _minimumFractionDigits = 2
 
+            case .decimal:
+                _usesSignificantDigits = false
+                _usesGroupingSeparator = true
+                _maximumFractionDigits = 3
+                _minimumIntegerDigits = 1
+
             default:
                 _usesSignificantDigits = true
                 _usesGroupingSeparator = true

diff --git a/TestFoundation/TestNSNumberFormatter.swift b/TestFoundation/TestNSNumberFormatter.swift
@@ -198,8 +198,12 @@ class TestNSNumberFormatter: XCTestCase {
     func test_minimumIntegerDigits() {
         let numberFormatter = NumberFormatter()
         numberFormatter.minimumIntegerDigits = 3
-        let formattedString = numberFormatter.string(from: 0)
+        var formattedString = numberFormatter.string(from: 0)
         XCTAssertEqual(formattedString, "000")
+
+        numberFormatter.numberStyle = .decimal
+        formattedString = numberFormatter.string(from: 0.1)
+        XCTAssertEqual(formattedString, "0.1")        
     }
 
     func test_maximumIntegerDigits() {
@@ -375,8 +379,12 @@ class TestNSNumberFormatter: XCTestCase {
         let numberFormatter = NumberFormatter()
         numberFormatter.usesSignificantDigits = true
         numberFormatter.maximumSignificantDigits = 3
-        let formattedString = numberFormatter.string(from: 42.42424242)
+        var formattedString = numberFormatter.string(from: 42.42424242)
         XCTAssertEqual(formattedString, "42.4")
+
+        numberFormatter.numberStyle = .decimal
+        formattedString = numberFormatter.string(from: 987654321)
+        XCTAssertEqual(formattedString, "987,654,321")
     }
 
     func test_stringFor() {