Change the order of keys in edit script for map

Author: lexmag

lib/ex_unit/lib/ex_unit/diff.ex

@@ -186,7 +186,6 @@ defmodule ExUnit.Diff do
 
   defp format_list_elem(elem, false),
     do: inspect(elem)
-
   defp format_list_elem({key, val}, true),
     do: format_key_value(key, val, true)
 
@@ -225,11 +224,7 @@ defmodule ExUnit.Diff do
       Inspect.List.keyword?(missing) and
       Inspect.List.keyword?(same)
 
-    result = Enum.reduce(same, [], fn({key, val}, acc) ->
-      map_pair = format_key_value(key, val, keyword?)
-      [[eq: ", ", eq: map_pair] | acc]
-    end)
-    result = Enum.reduce(missing, result, fn({key, val}, acc) ->
+    result = Enum.reduce(missing, [], fn({key, val}, acc) ->
       map_pair = format_key_value(key, val, keyword?)
       [[ins: ", ", ins: map_pair] | acc]
     end)
@@ -241,6 +236,10 @@ defmodule ExUnit.Diff do
       value_diff = script_inner(val1, val2)
       [[{:eq, ", "}, {:eq, format_key(key, keyword?)}, value_diff] | acc]
     end)
+    result = Enum.reduce(same, result, fn({key, val}, acc) ->
+      map_pair = format_key_value(key, val, keyword?)
+      [[eq: ", ", eq: map_pair] | acc]
+    end)
     [[_ | elem_diff] | rest] = result
     [{:eq, "%" <> name <> "{"}, [elem_diff | rest], {:eq, "}"}]
   end

lib/ex_unit/test/ex_unit/diff_test.exs

@@ -117,23 +117,23 @@ defmodule ExUnit.DiffTest do
     expected = [
       {:eq, "%{"},
       [
-        [{:eq, "12 => "}, [del: "1", ins: "3", eq: "2"]],
+        [eq: "1 => 1"], [eq: ", ", eq: "2 => 2"], [eq: ", ", eq: "3 => 3"],
+        [eq: ", ", eq: "4 => 4"], [eq: ", ", eq: "11 => 11"], [eq: ", ", eq: "14 => 14"],
+        [eq: ", ", eq: "15 => 15"],
+        [{:eq, ", "}, {:eq, "12 => "}, [del: "1", ins: "3", eq: "2"]],
         [del: ", ", del: "5 => 5"], [del: ", ", del: "6 => 6"], [del: ", ", del: "7 => 7"],
         [del: ", ", del: "8 => 8"], [del: ", ", del: "9 => 9"], [del: ", ", del: "10 => 10"],
         [ins: ", ", ins: "13 => 13"],
-        [eq: ", ", eq: "1 => 1"], [eq: ", ", eq: "2 => 2"], [eq: ", ", eq: "3 => 3"],
-        [eq: ", ", eq: "4 => 4"], [eq: ", ", eq: "11 => 11"], [eq: ", ", eq: "14 => 14"],
-        [eq: ", ", eq: "15 => 15"],
       ],
       {:eq, "}"}
     ]
     assert script(map1, map2) == expected
 
     map1 = %{baz: 12}
     map2 = %{foo: 12, bar: 12, baz: 12}
-    expected = [{:eq, "%{"}, [[ins: "bar: 12"], [ins: ", ", ins: "foo: 12"], [eq: ", ", eq: "baz: 12"]], {:eq, "}"}]
+    expected = [{:eq, "%{"}, [[eq: "baz: 12"], [ins: ", ", ins: "bar: 12"], [ins: ", ", ins: "foo: 12"]], {:eq, "}"}]
     assert script(map1, map2) == expected
-    expected = [{:eq, "%{"}, [[del: "bar: 12"], [del: ", ", del: "foo: 12"], [eq: ", ", eq: "baz: 12"]], {:eq, "}"}]
+    expected = [{:eq, "%{"}, [[eq: "baz: 12"], [del: ", ", del: "bar: 12"], [del: ", ", del: "foo: 12"]], {:eq, "}"}]
     assert script(map2, map1) == expected
     assert script(map1, %{}) == [{:eq, "%{"}, [[del: "baz: 12"]], {:eq, "}"}]
     assert script(%{}, map1) == [{:eq, "%{"}, [[ins: "baz: 12"]], {:eq, "}"}]