Skip to content

Fix UserDefaults.double(forKey:) behavior #4783

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
Jul 26, 2023
Merged

Fix UserDefaults.double(forKey:) behavior #4783

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
9 changes: 9 additions & 0 deletions Sources/Foundation/UserDefaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,15 @@ open class UserDefaults: NSObject {
if let bVal = aVal as? Double {
return bVal
}
if let bVal = aVal as? Bool {
return NSNumber(value: bVal).doubleValue
}
if let bVal = aVal as? Int {
return NSNumber(value: bVal).doubleValue
}
if let bVal = aVal as? Float {
return NSNumber(value: bVal).doubleValue
}
if let bVal = aVal as? String {
return NSString(string: bVal).doubleValue
}
Expand Down
30 changes: 30 additions & 0 deletions Tests/Foundation/Tests/TestUserDefaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ class TestUserDefaults : XCTestCase {
("test_setValue_FloatFromInt", test_setValue_FloatFromInt ),
("test_setValue_FloatFromDouble", test_setValue_FloatFromDouble ),
("test_setValue_FloatFromString", test_setValue_FloatFromString ),
("test_setValue_DoubleFromBool", test_setValue_DoubleFromBool ),
("test_setValue_DoubleFromInt", test_setValue_DoubleFromInt ),
("test_setValue_DoubleFromFloat", test_setValue_DoubleFromFloat ),
("test_setValue_DoubleFromString", test_setValue_DoubleFromString ),
("test_setValue_StringFromBool", test_setValue_StringFromBool ),
("test_setValue_StringFromInt", test_setValue_StringFromInt ),
Expand Down Expand Up @@ -310,6 +313,33 @@ class TestUserDefaults : XCTestCase {
XCTAssertEqual(defaults.float(forKey: "key1"), 1234)
}

func test_setValue_DoubleFromBool() {
let defaults = UserDefaults.standard

// Register a boolean default value. UserDefaults.double(forKey:) is supposed to return the converted Double value
defaults.set(true, forKey: "key1")

XCTAssertEqual(defaults.double(forKey: "key1"), 1)
}

func test_setValue_DoubleFromInt() {
let defaults = UserDefaults.standard

// Register an integer default value. UserDefaults.double(forKey:) is supposed to return the converted Double value
defaults.set(42, forKey: "key1")

XCTAssertEqual(defaults.double(forKey: "key1"), 42)
}

func test_setValue_DoubleFromFloat() {
let defaults = UserDefaults.standard

// Register a float default value. UserDefaults.double(forKey:) is supposed to return the converted Double value
defaults.set(12.34 as Float, forKey: "key1")

XCTAssertEqual(defaults.double(forKey: "key1"), Double(12.34 as Float))
}

func test_setValue_DoubleFromString() {
let defaults = UserDefaults.standard

Expand Down