Merge pull request #1107 from bubski/person-name-components-is-equal

Author: swift-ci

Foundation/NSPersonNameComponents.swift

@@ -64,6 +64,28 @@ open class NSPersonNameComponents : NSObject, NSCopying, NSSecureCoding {
         }
         return copy
     }
+
+    open override func isEqual(_ object: Any?) -> Bool {
+        guard let object = object else { return false }
+
+        switch object {
+        case let other as NSPersonNameComponents: return self.isEqual(other)
+        case let other as PersonNameComponents: return self.isEqual(other._bridgeToObjectiveC())
+        default: return false
+        }
+    }
+
+    private func isEqual(_ other: NSPersonNameComponents) -> Bool {
+        if self === other { return true }
+        
+        return (self.namePrefix == other.namePrefix
+            && self.givenName == other.givenName
+            && self.middleName == other.middleName
+            && self.familyName == other.familyName
+            && self.nameSuffix == other.nameSuffix
+            && self.nickname == other.nickname
+            && self.phoneticRepresentation == other.phoneticRepresentation)
+    }
 
     /* The below examples all assume the full name Dr. Johnathan Maple Appleseed Esq., nickname "Johnny" */
 

TestFoundation/TestNSPersonNameComponents.swift

@@ -17,13 +17,42 @@
     import SwiftXCTest
 #endif
 
+private func assertEqual(_ lhs:PersonNameComponents,
+                         _ rhs: PersonNameComponents,
+                         file: StaticString = #file,
+                         line: UInt = #line) {
+    assert(equal: true, lhs, rhs, file: file, line: line)
+}
+
+private func assertNotEqual(_ lhs:PersonNameComponents,
+                            _ rhs: PersonNameComponents,
+                            file: StaticString = #file,
+                            line: UInt = #line) {
+    assert(equal: false, lhs, rhs, file: file, line: line)
+}
 
+private func assert(equal: Bool,
+                    _ lhs:PersonNameComponents,
+                    _ rhs: PersonNameComponents,
+                    file: StaticString = #file,
+                    line: UInt = #line) {
+    if equal {
+        XCTAssertEqual(lhs, rhs, file: file, line: line)
+        XCTAssertEqual(lhs._bridgeToObjectiveC(), rhs._bridgeToObjectiveC(), file: file, line: line)
+        XCTAssertTrue(lhs._bridgeToObjectiveC().isEqual(rhs), file: file, line: line)
+    } else {
+        XCTAssertNotEqual(lhs, rhs, file: file, line: line)
+        XCTAssertNotEqual(lhs._bridgeToObjectiveC(), rhs._bridgeToObjectiveC(), file: file, line: line)
+        XCTAssertFalse(lhs._bridgeToObjectiveC().isEqual(rhs), file: file, line: line)
+    }
+}
 
 class TestNSPersonNameComponents : XCTestCase {
 
     static var allTests: [(String, (TestNSPersonNameComponents) -> () throws -> Void)] {
         return [
             ("testCopy", testCopy),
+            ("testEquality", testEquality),
         ]
     }
 
@@ -39,6 +68,78 @@ class TestNSPersonNameComponents : XCTestCase {
         XCTAssertEqual(original.phoneticRepresentation!.givenName,copy.phoneticRepresentation!.givenName)
         XCTAssertNil(copy.phoneticRepresentation!.phoneticRepresentation)
     }
+
+    func testEquality() {
+        do {
+            let lhs = PersonNameComponents()
+            let rhs = PersonNameComponents()
+            assertEqual(lhs, rhs)
+        }
+
+        let lhs = self.makePersonNameComponentsWithTestValues()
+        do {
+            let rhs = self.makePersonNameComponentsWithTestValues()
+            assertEqual(lhs, rhs)
+        }
+        do {
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.namePrefix = "differentValue"
+            assertNotEqual(lhs, rhs)
+        }
+        do {
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.givenName = "differentValue"
+            assertNotEqual(lhs, rhs)
+        }
+        do {
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.middleName = "differentValue"
+            assertNotEqual(lhs, rhs)
+        }
+        do {
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.familyName = "differentValue"
+            assertNotEqual(lhs, rhs)
+        }
+        do {
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.nameSuffix = "differentValue"
+            assertNotEqual(lhs, rhs)
+        }
+        do {
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.nickname = "differentValue"
+            assertNotEqual(lhs, rhs)
+        }
+        do {
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.phoneticRepresentation?.namePrefix = "differentValue"
+            assertNotEqual(lhs, rhs)
+        }
+    }
+
+    // MARK: - Helpers
+
+    private func makePersonNameComponentsWithTestValues() -> PersonNameComponents {
+        var components = PersonNameComponents()
+        components.namePrefix = "namePrefix"
+        components.givenName = "givenName"
+        components.middleName = "middleName"
+        components.familyName = "familyName"
+        components.nameSuffix = "nameSuffix"
+        components.nickname = "nickname"
+        components.phoneticRepresentation = {
+            var components = PersonNameComponents()
+            components.namePrefix = "phonetic_namePrefix"
+            components.givenName = "phonetic_givenName"
+            components.middleName = "phonetic_middleName"
+            components.familyName = "phonetic_familyName"
+            components.nameSuffix = "phonetic_nameSuffix"
+            components.nickname = "phonetic_nickname"
+            return components
+        }()
+        return components
+    }
 }