From ab147d00fbadf31c1748ae5e05f0800e7ed6a837 Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Tue, 6 Aug 2019 22:18:05 -0600
Subject: [PATCH] Cleanup match methods

---
 src/spectator/matchers/array_matcher.cr | 90 +++++++++++++++----------
 1 file changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/spectator/matchers/array_matcher.cr b/src/spectator/matchers/array_matcher.cr
index 1efef4d..f8178bb 100644
--- a/src/spectator/matchers/array_matcher.cr
+++ b/src/spectator/matchers/array_matcher.cr
@@ -28,50 +28,70 @@ module Spectator::Matchers
     def match(actual)
       actual_elements = actual.value.to_a
       expected_elements = expected.value.to_a
-      if expected_elements.size == actual_elements.size
-        index = 0
-        expected_elements.zip(actual_elements) do |expected_element, actual_element|
-          unless expected_element == actual_element
-            return FailedMatchData.new("#{actual.label} does not contain exactly #{expected.label} (element mismatch)",
-              [
-                LabeledValue.new(expected_element.inspect, "expected"),
-                LabeledValue.new(actual_element.inspect, "actual"),
-                LabeledValue.new(index.to_s, "index"),
-              ])
-          end
-          index += 1
-        end
-        # Success.
+      index = compare_arrays(expected_elements, actual_elements)
+
+      case index
+      when true # Contents are identical.
         SuccessfulMatchData.new
-      else
-        # Size mismatch.
-        FailedMatchData.new("#{actual.label} does not contain exactly #{expected.label} (size mismatch)",
-          [
-            LabeledValue.new(expected_elements.inspect, "expected"),
-            LabeledValue.new(actual_elements.inspect, "actual"),
-            LabeledValue.new(expected_elements.size, "expected size"),
-            LabeledValue.new(actual_elements.size, "actual size"),
-          ])
+      when false # Size differs.
+        failed_size_mismatch(expected_elements, actual_elements, actual.label)
+      else # Content differs.
+        failed_content_mismatch(expected_elements, actual_elements, index, actual.label)
       end
     end
 
     def negated_match(actual)
       actual_elements = actual.value.to_a
       expected_elements = expected.value.to_a
-      if expected_elements.size == actual_elements.size
-        index = 0
-        expected_elements.zip(actual_elements) do |expected_element, actual_element|
-          return SuccessfulMatchData.new unless expected_element == actual_element
-          index += 1
-        end
-        FailedMatchData.new("#{actual.label} contains exactly #{expected.label}",
-          [
-            LabeledValue.new("Not #{expected_elements.inspect}", "expected"),
-            LabeledValue.new(actual_elements.inspect, "actual"),
-          ])
-      else
+
+      case compare_arrays(expected_elements, actual_elements)
+      when true # Contents are identical.
+        failed_content_identical(expected_elements, actual_elements, actual.label)
+      when false # Size differs.
+        SuccessfulMatchData.new
+      else # Contents differ.
         SuccessfulMatchData.new
       end
     end
+
+    private def compare_arrays(expected_elements, actual_elements)
+      if expected_elements.size == actual_elements.size
+        index = 0
+        expected_elements.zip(actual_elements) do |expected_element, actual_element|
+          return index unless expected_element == actual_element
+          index += 1
+        end
+        true
+      else
+        false
+      end
+    end
+
+    def failed_size_mismatch(expected_elements, actual_elements, actual_label)
+      FailedMatchData.new("#{actual_label} does not contain exactly #{expected.label} (size mismatch)",
+        [
+          LabeledValue.new(expected_elements.inspect, "expected"),
+          LabeledValue.new(actual_elements.inspect, "actual"),
+          LabeledValue.new(expected_elements.size, "expected size"),
+          LabeledValue.new(actual_elements.size, "actual size"),
+        ])
+    end
+
+    def failed_content_mismatch(expected_elements, actual_elements, index, actual_label)
+      FailedMatchData.new("#{actual_label} does not contain exactly #{expected.label} (element mismatch)",
+        [
+          LabeledValue.new(expected_elements[index].inspect, "expected"),
+          LabeledValue.new(actual_elements[index].inspect, "actual"),
+          LabeledValue.new(index.to_s, "index"),
+        ])
+    end
+
+    def failed_content_identical(expected_elements, actual_elements, actual_label)
+      FailedMatchData.new("#{actual.label} contains exactly #{expected.label}",
+        [
+          LabeledValue.new("Not #{expected_elements.inspect}", "expected"),
+          LabeledValue.new(actual_elements.inspect, "actual"),
+        ])
+    end
   end
 end