it already renders all of message not only values

ma2gedev · Dec 28, 2020 · 6efeed9 · 6efeed9
1 parent ad933f7
commit 6efeed9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/power_assert/assertion.ex b/lib/power_assert/assertion.ex
@@ -42,7 +42,7 @@ defmodule PowerAssert.Assertion do
           if right do
             right
           else
-            message = PowerAssert.Renderer.render_values(expr, position_and_values)
+            message = PowerAssert.Renderer.render(expr, position_and_values)
             unquote(message_ast)
 
             raise ExUnit.AssertionError,
@@ -63,7 +63,7 @@ defmodule PowerAssert.Assertion do
             unquote(vars)
 
           _ ->
-            message = PowerAssert.Renderer.render_values(expr, position_and_values)
+            message = PowerAssert.Renderer.render(expr, position_and_values)
             unquote(message_ast)
 
             raise ExUnit.AssertionError,
@@ -91,7 +91,7 @@ defmodule PowerAssert.Assertion do
       # wrap result for avoid warning: this check/guard will always yield the same result
       unless left == (fn x -> x end).(result) do
         message =
-          PowerAssert.Renderer.render_values(unquote(code), left_position_and_values ++ position_and_values, left, result)
+          PowerAssert.Renderer.render(unquote(code), left_position_and_values ++ position_and_values, left, result)
 
         unquote(message_ast)
 
@@ -113,7 +113,7 @@ defmodule PowerAssert.Assertion do
       unquote(injected_ast)
 
       unless result do
-        message = PowerAssert.Renderer.render_values(unquote(code), position_and_values)
+        message = PowerAssert.Renderer.render(unquote(code), position_and_values)
         unquote(message_ast)
 
         raise ExUnit.AssertionError,

diff --git a/lib/power_assert/debug.ex b/lib/power_assert/debug.ex
@@ -24,7 +24,7 @@ defmodule PowerAssert.Debug do
       unquote(injected_ast)
 
       IO.puts(
-        PowerAssert.Renderer.render_values(unquote(code), var!(position_and_values, PowerAssert.Assertion))
+        PowerAssert.Renderer.render(unquote(code), var!(position_and_values, PowerAssert.Assertion))
       )
 
       var!(result, PowerAssert.Assertion)

diff --git a/lib/power_assert/renderer.ex b/lib/power_assert/renderer.ex
@@ -6,13 +6,13 @@ defmodule PowerAssert.Renderer do
   @doc """
   renders test result
   """
-  def render_values(code_ast, position_and_values, lhs_result \\ nil, rhs_result \\ nil)
+  def render(code_ast, position_and_values, lhs_result \\ nil, rhs_result \\ nil)
 
-  def render_values(code_ast, [], lhs_result, rhs_result) do
+  def render(code_ast, [], lhs_result, rhs_result) do
     Macro.to_string(code_ast) <> extra_information(lhs_result, rhs_result)
   end
 
-  def render_values(code_ast, position_and_values, lhs_result, rhs_result) do
+  def render(code_ast, position_and_values, lhs_result, rhs_result) do
     code_str = Macro.to_string(code_ast)
     position_and_values = Enum.sort(position_and_values, fn %PositionAndValue{position: x_pos}, %PositionAndValue{position: y_pos} -> x_pos > y_pos end)
     %PositionAndValue{position: max_pos} = Enum.max_by(position_and_values, fn %PositionAndValue{position: pos} -> pos end)