Fix UserDefaults.double(forKey:) behavior

swiftlang · Jul 26, 2023 · 9cf3489 · 9cf3489
1 parent 3b034eb
commit 9cf3489
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/Sources/Foundation/UserDefaults.swift b/Sources/Foundation/UserDefaults.swift
@@ -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
         }

diff --git a/Tests/Foundation/Tests/TestUserDefaults.swift b/Tests/Foundation/Tests/TestUserDefaults.swift
@@ -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 ),
@@ -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