Enable NSLocale keyed archiving unit tests (#596)

* Archive NSLocale identifier as NSString * Override isEqual for NSLocale * Uncomment NSLocale archiving test
apple · Aug 25, 2016 · 80e0f05 · 80e0f05
1 parent 99493a4
commit 80e0f05
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Foundation/NSLocale.swift b/Foundation/NSLocale.swift
@@ -59,9 +59,17 @@ open class NSLocale: NSObject, NSCopying, NSSecureCoding {
         return self 
     }
 
+    override open func isEqual(_ object: Any?) -> Bool {
+        guard let locale = object as? NSLocale else {
+            return false
+        }
+
+        return locale.localeIdentifier == localeIdentifier
+    }
+
     open func encode(with aCoder: NSCoder) {
         if aCoder.allowsKeyedCoding {
-            let identifier = CFLocaleGetIdentifier(self._cfObject)
+            let identifier = CFLocaleGetIdentifier(self._cfObject)._nsObject
             aCoder.encode(identifier, forKey: "NS.identifier")
         } else {
             NSUnimplemented()

diff --git a/TestFoundation/TestNSKeyedArchiver.swift b/TestFoundation/TestNSKeyedArchiver.swift
@@ -58,7 +58,7 @@ class TestNSKeyedArchiver : XCTestCase {
             ("test_archive_concrete_value", test_archive_concrete_value),
             ("test_archive_dictionary", test_archive_dictionary),
             ("test_archive_generic_objc", test_archive_generic_objc),
-//            ("test_archive_locale", test_archive_locale),
+            ("test_archive_locale", test_archive_locale),
             ("test_archive_string", test_archive_string),
             ("test_archive_mutable_array", test_archive_mutable_array),
             ("test_archive_mutable_dictionary", test_archive_mutable_dictionary),