diff --git a/test/drawing_test.exs b/test/drawing_test.exs index c712864..555231d 100644 --- a/test/drawing_test.exs +++ b/test/drawing_test.exs @@ -2,12 +2,6 @@ defmodule Mudbrick.DrawingTest do use ExUnit.Case, async: true use ExUnitProperties - import Mudbrick.TestHelper, - only: [ - invalid_colour: 0, - output: 2 - ] - alias Mudbrick.Path alias Mudbrick.Path.{ @@ -17,6 +11,13 @@ defmodule Mudbrick.DrawingTest do Rectangle } + alias Mudbrick.TestHelper + + import Mudbrick.TestHelper, + only: [ + invalid_colour: 0 + ] + test "can add drawings to a page" do import Mudbrick @@ -175,7 +176,7 @@ defmodule Mudbrick.DrawingTest do end defp operations(f) do - output(fn _ -> f.() end, Mudbrick.Path.Output) + TestHelper.wrapped_output(fn _ -> f.() end, Mudbrick.Path.Output) |> Enum.map(&Mudbrick.TestHelper.show/1) |> Enum.reverse() end diff --git a/test/mudbrick/text_block_test.exs b/test/mudbrick/text_block_test.exs index 65d65b5..21c50ef 100644 --- a/test/mudbrick/text_block_test.exs +++ b/test/mudbrick/text_block_test.exs @@ -1,7 +1,7 @@ defmodule Mudbrick.TextBlockTest do use ExUnit.Case, async: true - import Mudbrick.TestHelper, only: [output: 2, bodoni_regular: 0] + import Mudbrick.TestHelper, only: [bodoni_regular: 0] alias Mudbrick.Font alias Mudbrick.TextBlock @@ -451,7 +451,7 @@ defmodule Mudbrick.TextBlockTest do end defp output(f) do - output(f, Mudbrick.TextBlock.Output) |> Enum.reverse() + Mudbrick.TestHelper.wrapped_output(f, TextBlock.Output) |> Enum.reverse() end defp operations(ops) do diff --git a/test/test_helper.exs b/test/test_helper.exs index 4e72653..f3732c8 100644 --- a/test/test_helper.exs +++ b/test/test_helper.exs @@ -51,7 +51,7 @@ defmodule Mudbrick.TestHelper do @example_png end - def output(f, output_mod) when is_function(f) do + def wrapped_output(f, output_mod) when is_function(f) do import Mudbrick {doc, _contents_obj} =