Merge pull request #894 from ddunn2/numFormatter

Author: swift-ci

Foundation/NSByteCountFormatter.swift

@@ -296,9 +296,9 @@ open class ByteCountFormatter : Formatter {
                 return partsToIncludeFor(value: result!, unit: unit)
             } else {
                 if lengthOfInt(number: Int(bytes)) == 3 {
+                    numberFormatter.usesSignificantDigits = false
                     numberFormatter.maximumFractionDigits = 1
                 } else {
-                    numberFormatter.usesSignificantDigits = true
                     numberFormatter.maximumSignificantDigits = 3
                     numberFormatter.minimumSignificantDigits = 3
                 }
@@ -345,7 +345,6 @@ open class ByteCountFormatter : Formatter {
                 if lengthOfInt(number: Int(bytes)) > 3 {
                     numberFormatter.maximumFractionDigits = 0
                 } else {
-                    numberFormatter.usesSignificantDigits = true
                     numberFormatter.maximumSignificantDigits = 3
                 }
                 let result = numberFormatter.string(from: NSNumber(value: bytes))

Foundation/NSNumberFormatter.swift

@@ -193,7 +193,6 @@ open class NumberFormatter : Formatter {
                 _minimumFractionDigits = 2
 
             case .decimal:
-                _usesSignificantDigits = false
                 _usesGroupingSeparator = true
                 _maximumFractionDigits = 3
                 _minimumIntegerDigits = 1
@@ -783,6 +782,7 @@ open class NumberFormatter : Formatter {
         }
         set {
             _reset()
+            _usesSignificantDigits = true
             _minimumSignificantDigits = newValue
         }
     }
@@ -794,6 +794,7 @@ open class NumberFormatter : Formatter {
         }
         set {
             _reset()
+            _usesSignificantDigits = true
             _maximumSignificantDigits = newValue
         }
     }

TestFoundation/TestNSNumberFormatter.swift

@@ -369,22 +369,22 @@ class TestNSNumberFormatter: XCTestCase {
 
     func test_minimumSignificantDigits() {
         let numberFormatter = NumberFormatter()
-        numberFormatter.usesSignificantDigits = true
+        numberFormatter.numberStyle = .decimal
         numberFormatter.minimumSignificantDigits = 3
         let formattedString = numberFormatter.string(from: 42)
         XCTAssertEqual(formattedString, "42.0")
     }
 
     func test_maximumSignificantDigits() {
         let numberFormatter = NumberFormatter()
+        numberFormatter.numberStyle = .decimal
+        var formattedString = numberFormatter.string(from: 987654321)
+        XCTAssertEqual(formattedString, "987,654,321")
+        
         numberFormatter.usesSignificantDigits = true
         numberFormatter.maximumSignificantDigits = 3
-        var formattedString = numberFormatter.string(from: 42.42424242)
+        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() {
@@ -404,6 +404,9 @@ class TestNSNumberFormatter: XCTestCase {
         XCTAssertEqual(numberFormatter.string(for: 3), "three")
         XCTAssertEqual(numberFormatter.string(for: 0.3), "zero point three")
 
+        numberFormatter.numberStyle = .decimal
+        XCTAssertEqual(numberFormatter.string(for: 234.5678), "234.568")
+        
         numberFormatter.locale = Locale(identifier: "zh_CN")
         numberFormatter.numberStyle = .spellOut
         XCTAssertEqual(numberFormatter.string(from: 11.4), "十一点四")