implement for structs

Author: dkuku

lib/ex_unit/lib/ex_unit/diff.ex

@@ -1143,10 +1143,21 @@ defmodule ExUnit.Diff do
   defp maybe_escape(other, _env), do: escape(other)
 
   # We escape container types to make a distinction between AST and values that
-  # should be inspected. Maps should not be inspected, convert it to ast.
+  # should be inspected. Maps and structs without custom inspect implementation
+  # should not be inspected, convert it to ast.
   # All other values have no special AST representation, so we can keep them as is.
-  defp escape(other) when is_struct(other), do: other
-  defp escape(other) when is_map(other), do: {:%{}, [], Map.to_list(other)}
+  defp escape(other) when is_map(other) do
+    struct = maybe_struct(other)
+
+    if struct && Inspect.impl_for(other) not in [Inspect.Any, Inspect.Map] do
+      other
+    else
+      other
+      |> Map.to_list()
+      |> build_map_or_struct(struct)
+    end
+  end
+
   defp escape(other) when is_list(other) or is_tuple(other), do: {other}
   defp escape(other), do: other
 

lib/ex_unit/test/ex_unit/diff_test.exs

@@ -10,6 +10,10 @@ defmodule ExUnit.DiffTest do
     defstruct [:name, :age]
   end
 
+  defmodule Customer do
+    defstruct [:address, :age, :first_name, :language, :last_name, :notifications]
+  end
+
   defmodule Person do
     defstruct [:age]
   end
@@ -875,30 +879,30 @@ defmodule ExUnit.DiffTest do
 
   test "maps in lists" do
     map = %{
-      first_name: "John",
-      last_name: "Doe",
-      age: 30,
-      notifications: true,
-      language: "en-US",
       address: %{
         street: "123 Main St",
         city: "Springfield",
         state: "IL",
         zip: "62701"
-      }
+      },
+      age: 30,
+      first_name: "John",
+      language: "en-US",
+      last_name: "Doe",
+      notifications: true
     }
 
     refute_diff(
       [map] == [],
       """
       [
         -%{
-          address: %{state: \"IL\", zip: \"62701\", street: \"123 Main St\", city: \"Springfield\"},
+          address: %{state: "IL", zip: "62701", street: "123 Main St", city: "Springfield"},
           age: 30,
-          first_name: \"John\",
-          last_name: \"Doe\",
-          notifications: true,
-          language: \"en-US\"
+          first_name: "John",
+          language: "en-US",
+          last_name: "Doe",
+          notifications: true
         }-
       ]\
       """,
@@ -911,12 +915,12 @@ defmodule ExUnit.DiffTest do
       """
       [
         +%{
-          address: %{state: \"IL\", zip: \"62701\", street: \"123 Main St\", city: \"Springfield\"},
+          address: %{state: "IL", zip: "62701", street: "123 Main St", city: "Springfield"},
           age: 30,
-          first_name: \"John\",
-          last_name: \"Doe\",
-          notifications: true,
-          language: \"en-US\"
+          first_name: "John",
+          language: "en-US",
+          last_name: "Doe",
+          notifications: true
         }+
       ]\
       """
@@ -925,6 +929,58 @@ defmodule ExUnit.DiffTest do
     assert_diff([map] == [map], [])
   end
 
+  test "structs in lists" do
+    customer = %Customer{
+      address: %{
+        street: "123 Main St",
+        city: "Springfield",
+        state: "IL",
+        zip: "62701"
+      },
+      age: 30,
+      first_name: "John",
+      language: "en-US",
+      last_name: "Doe",
+      notifications: true
+    }
+
+    refute_diff(
+      [customer] == [],
+      """
+      [
+        -%ExUnit.DiffTest.Customer{
+          address: %{state: "IL", zip: "62701", street: "123 Main St", city: "Springfield"},
+          age: 30,
+          first_name: "John",
+          language: "en-US",
+          last_name: "Doe",
+          notifications: true
+        }-
+      ]\
+      """,
+      "[]"
+    )
+
+    refute_diff(
+      [] == [customer],
+      "[]",
+      """
+      [
+        +%ExUnit.DiffTest.Customer{
+          address: %{state: "IL", zip: "62701", street: "123 Main St", city: "Springfield"},
+          age: 30,
+          first_name: "John",
+          language: "en-US",
+          last_name: "Doe",
+          notifications: true
+        }+
+      ]\
+      """
+    )
+
+    assert_diff([customer] == [customer], [])
+  end
+
   test "maps and structs with escaped values" do
     refute_diff(
       %User{age: {1, 2, 3}} = %User{age: {1, 2, 4}},