Skip to content

Allow numeric types in NSNumberFormatter.string(for:)[SR-2477] #643

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 1 commit into from
Sep 21, 2016
Merged

Allow numeric types in NSNumberFormatter.string(for:)[SR-2477] #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion Foundation/NSNumberFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ open class NumberFormatter : Formatter {
open func objectValue(_ string: String, range: inout NSRange) throws -> Any? { NSUnimplemented() }

open override func string(for obj: Any) -> String? {
guard let number = obj as? NSNumber else { return nil }
//we need to allow Swift's numeric types here - Int, Double et al.
guard let number = _SwiftValue.store(obj) as? NSNumber else { return nil }
return string(from: number)
}

Expand Down
16 changes: 15 additions & 1 deletion TestFoundation/TestNSNumberFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ class TestNSNumberFormatter: XCTestCase {
("test_currencyGroupingSeparator", test_currencyGroupingSeparator),
("test_lenient", test_lenient),
("test_minimumSignificantDigits", test_minimumSignificantDigits),
("test_maximumSignificantDigits", test_maximumSignificantDigits)
("test_maximumSignificantDigits", test_maximumSignificantDigits),
("test_stringFor", test_stringFor)
]
}

Expand Down Expand Up @@ -341,5 +342,18 @@ class TestNSNumberFormatter: XCTestCase {
let formattedString = numberFormatter.string(from: 42.42424242)
XCTAssertEqual(formattedString, "42.4")
}

func test_stringFor() {
let numberFormatter = NumberFormatter()
XCTAssertEqual(numberFormatter.string(for: 10)!, "10")
XCTAssertEqual(numberFormatter.string(for: 3.14285714285714)!, "3")
XCTAssertEqual(numberFormatter.string(for: true)!, "1")
XCTAssertEqual(numberFormatter.string(for: false)!, "0")
XCTAssertNil(numberFormatter.string(for: [1,2]))
XCTAssertEqual(numberFormatter.string(for: NSNumber(value: 99.1))!, "99")
XCTAssertNil(numberFormatter.string(for: "NaN"))
XCTAssertNil(numberFormatter.string(for: NSString(string: "NaN")))
}

}