Unit tests simplified

Author: bubski

TestFoundation/TestNSPersonNameComponents.swift

@@ -69,81 +69,77 @@ class TestNSPersonNameComponents : XCTestCase {
         XCTAssertNil(copy.phoneticRepresentation!.phoneticRepresentation)
     }
 
-    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
-    }
-
     func testEquality() {
         do {
             let lhs = PersonNameComponents()
             let rhs = PersonNameComponents()
             assertEqual(lhs, rhs)
         }
+
+        let lhs = self.makePersonNameComponentsWithTestValues()
         do {
-            let lhs = self.makePersonNameComponentsWithTestValues()
             let rhs = self.makePersonNameComponentsWithTestValues()
             assertEqual(lhs, rhs)
         }
         do {
-            var lhs = self.makePersonNameComponentsWithTestValues()
-            lhs.namePrefix = "differentValue"
-            let rhs = self.makePersonNameComponentsWithTestValues()
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.namePrefix = "differentValue"
             assertNotEqual(lhs, rhs)
         }
         do {
-            var lhs = self.makePersonNameComponentsWithTestValues()
-            lhs.givenName = "differentValue"
-            let rhs = self.makePersonNameComponentsWithTestValues()
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.givenName = "differentValue"
             assertNotEqual(lhs, rhs)
         }
         do {
-            var lhs = self.makePersonNameComponentsWithTestValues()
-            lhs.middleName = "differentValue"
-            let rhs = self.makePersonNameComponentsWithTestValues()
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.middleName = "differentValue"
             assertNotEqual(lhs, rhs)
         }
         do {
-            var lhs = self.makePersonNameComponentsWithTestValues()
-            lhs.familyName = "differentValue"
-            let rhs = self.makePersonNameComponentsWithTestValues()
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.familyName = "differentValue"
             assertNotEqual(lhs, rhs)
         }
         do {
-            var lhs = self.makePersonNameComponentsWithTestValues()
-            lhs.nameSuffix = "differentValue"
-            let rhs = self.makePersonNameComponentsWithTestValues()
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.nameSuffix = "differentValue"
             assertNotEqual(lhs, rhs)
         }
         do {
-            var lhs = self.makePersonNameComponentsWithTestValues()
-            lhs.nickname = "differentValue"
-            let rhs = self.makePersonNameComponentsWithTestValues()
+            var rhs = self.makePersonNameComponentsWithTestValues()
+            rhs.nickname = "differentValue"
             assertNotEqual(lhs, rhs)
         }
         do {
-            var lhs = self.makePersonNameComponentsWithTestValues()
-            lhs.phoneticRepresentation?.namePrefix = "differentValue"
-            let rhs = self.makePersonNameComponentsWithTestValues()
+            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
+    }
 }