Improve map keys handling in ExUnit.Diff

Author: lexmag

lib/ex_unit/lib/ex_unit/diff.ex

@@ -184,11 +184,11 @@ defmodule ExUnit.Diff do
     script_list([], [], keyword?, [elem_diff | acc])
   end
 
-  defp format_list_elem(elem, false), do: inspect(elem)
+  defp format_list_elem(elem, false),
+    do: inspect(elem)
 
-  defp format_list_elem({key, val}, true) do
-    format_key_value(Atom.to_string(key), inspect(val), true)
-  end
+  defp format_list_elem({key, val}, true),
+    do: format_key_value(key, val, true)
 
   defp script_tuple({_tuple1, -1}, {_tuple2, -1}, acc) do
     [[_ | elem_diff] | rest] = acc
@@ -226,20 +226,20 @@ defmodule ExUnit.Diff do
       Inspect.List.keyword?(same)
 
     result = Enum.reduce(same, [], fn({key, val}, acc) ->
-      map_pair = format_key_value(inspect(key), inspect(val), keyword?)
+      map_pair = format_key_value(key, val, keyword?)
       [[eq: ", ", eq: map_pair] | acc]
     end)
     result = Enum.reduce(missing, result, fn({key, val}, acc) ->
-      map_pair = format_key_value(inspect(key), inspect(val), keyword?)
+      map_pair = format_key_value(key, val, keyword?)
       [[ins: ", ", ins: map_pair] | acc]
     end)
     result = Enum.reduce(surplus, result, fn({key, val}, acc) ->
-      map_pair = format_key_value(inspect(key), inspect(val), keyword?)
+      map_pair = format_key_value(key, val, keyword?)
       [[del: ", ", del: map_pair] | acc]
     end)
     result = Enum.reduce(altered, result, fn({key, {val1, val2}}, acc) ->
       value_diff = script_inner(val1, val2)
-      [[{:eq, ", "}, script_key(key, keyword?), value_diff] | acc]
+      [[{:eq, ", "}, {:eq, format_key(key, keyword?)}, value_diff] | acc]
     end)
     [[_ | elem_diff] | rest] = result
     [{:eq, "%" <> name <> "{"}, [elem_diff | rest], {:eq, "}"}]
@@ -263,24 +263,16 @@ defmodule ExUnit.Diff do
     {surplus, altered, missing, same}
   end
 
-  defp script_key(key, false) do
-    [eq: inspect(key) <> " => "]
-  end
-
-  defp script_key(key, true) do
-    [eq: Atom.to_string(key) <> ": "]
-  end
-
-  defp format_key_value(key, value, false) do
-    key <> " => " <> value
+  defp format_key(key, false) do
+    inspect(key) <> " => "
   end
 
-  defp format_key_value(":" <> rest, value, true) do
-    format_key_value(rest, value, true)
+  defp format_key(key, true) do
+    Atom.to_string(key) <> ": "
   end
 
-  defp format_key_value(key, value, true) do
-    key <> ": " <> value
+  defp format_key_value(key, value, keyword?) do
+    format_key(key, keyword?) <> inspect(value)
   end
 
   defp script_inner(term, term) do

lib/ex_unit/test/ex_unit/diff_test.exs

@@ -117,7 +117,7 @@ defmodule ExUnit.DiffTest do
     expected = [
       {:eq, "%{"},
       [
-        [[eq: "12 => "], [del: "1", ins: "3", eq: "2"]],
+        [{: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"],
@@ -144,7 +144,7 @@ defmodule ExUnit.DiffTest do
   test "structs" do
     user1 = %User{age: 16}
     user2 = %User{age: 21}
-    expected = [{:eq, "%ExUnit.DiffTest.User{"}, [[[eq: "age: "], [ins: "2", eq: "1", del: "6"]]], {:eq, "}"}]
+    expected = [{:eq, "%ExUnit.DiffTest.User{"}, [[{:eq, "age: "}, [ins: "2", eq: "1", del: "6"]]], {:eq, "}"}]
     assert script(user1, user2) == expected
     assert script(%User{}, %{}) == nil
     assert script(%User{}, %ExUnit.Test{}) == nil