Merge pull request #524 from ikesyo/simplify-equal-for-array-of-optional

Simplify `equal` matcher for `[T?]`
Quick · May 10, 2018 · d47a10f · d47a10f
2 parents 08f7a5d + fe10f81
commit d47a10f
Showing 1 changed file with 2 additions and 26 deletions.
diff --git a/Sources/Nimble/Matchers/Equal.swift b/Sources/Nimble/Matchers/Equal.swift
@@ -29,32 +29,8 @@ public func equal<T: Equatable>(_ expectedValue: [T?]) -> Predicate<[T?]> {
             )
         }
 
-        let doesNotMatch = PredicateResult(
-            status: .doesNotMatch,
-            message: msg
-        )
-
-        if expectedValue.count != actualValue.count {
-            return doesNotMatch
-        }
-
-        for (index, item) in actualValue.enumerated() {
-            let otherItem = expectedValue[index]
-            if item == nil && otherItem == nil {
-                continue
-            } else if item == nil && otherItem != nil {
-                return doesNotMatch
-            } else if item != nil && otherItem == nil {
-                return doesNotMatch
-            } else if item! != otherItem! {
-                return doesNotMatch
-            }
-        }
-
-        return PredicateResult(
-            status: .matches,
-            message: msg
-        )
+        let matches = expectedValue == actualValue
+        return PredicateResult(bool: matches, message: msg)
     }
 }