Skip to content

Updated NumberFormatter to match expected behavior #894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 5, 2017
Merged

Updated NumberFormatter to match expected behavior #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
031e824
Updated NumberFormatter to match expected behavior
Feb 24, 2017
02caa31
Performance regression in NSMutableData[SR-3966]
Feb 22, 2017
5eb36f0
Gardening work for NSURLSession
Feb 9, 2017
ac2ae25
Removed space
nethraravindran Feb 23, 2017
e360b8d
Updated NumberFormatter to match expected behavior
Feb 24, 2017
b83ac78
Merge branch 'numFormatter' of https://github.com/ddunn2/swift-coreli…
Mar 3, 2017
9daee65
Merge remote-tracking branch 'origin/master' into numFormatter
Mar 3, 2017
a758827
Update ByteCountFormatter to work with updated NumberFormatter
Mar 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Foundation/NSByteCountFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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))
Expand Down
3 changes: 2 additions & 1 deletion Foundation/NSNumberFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ open class NumberFormatter : Formatter {
_minimumFractionDigits = 2

case .decimal:
_usesSignificantDigits = false
_usesGroupingSeparator = true
_maximumFractionDigits = 3
_minimumIntegerDigits = 1
Expand Down Expand Up @@ -783,6 +782,7 @@ open class NumberFormatter : Formatter {
}
set {
_reset()
_usesSignificantDigits = true
_minimumSignificantDigits = newValue
}
}
Expand All @@ -794,6 +794,7 @@ open class NumberFormatter : Formatter {
}
set {
_reset()
_usesSignificantDigits = true
_maximumSignificantDigits = newValue
}
}
Expand Down
15 changes: 9 additions & 6 deletions TestFoundation/TestNSNumberFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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), "十一点四")
Expand Down