fix tests add find_by_id method

ScenicFramework · Sep 22, 2023 · ea15f17 · ea15f17
1 parent 08026b5
commit ea15f17
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/lib/scenic/graph.ex b/lib/scenic/graph.ex
@@ -583,8 +583,6 @@ defmodule Scenic.Graph do
   """
 
   @spec find(graph :: t(), (any -> as_boolean(term()))) :: list(Primitive.t())
-  def find(graph, finder)
-
   def find(%__MODULE__{} = graph, finder) do
     reduce(graph, [], fn p, acc ->
       p
@@ -597,6 +595,18 @@ defmodule Scenic.Graph do
     |> Enum.reverse()
   end
 
+  def find_by_id(%__MODULE__{} = graph, finder) do
+    reduce(graph, [], fn p, acc ->
+      Map.get(p, :id)
+      |> finder.()
+      |> case do
+        true -> [p | acc]
+        false -> acc
+      end
+    end)
+    |> Enum.reverse()
+  end
+
   # --------------------------------------------------------
   # transform a single primitive by uid
   # pass in a list of uids to transform
@@ -651,7 +661,7 @@ defmodule Scenic.Graph do
   # pass in a finder function
   def modify(%__MODULE__{} = graph, finder, action) when is_function(finder, 1) do
     graph
-    |> find(finder)
+    |> find_by_id(finder)
     |> Enum.map(fn %{id: id} -> id end)
     |> Enum.uniq()
     |> Enum.reduce(graph, &modify(&2, &1, action))

diff --git a/test/scenic/graph_test.exs b/test/scenic/graph_test.exs
@@ -267,20 +267,38 @@ defmodule Scenic.GraphTest do
   end
 
   # ============================================================================
-  test "find returns the matching items" do
+    test "find returns the matching items" do
+      graph =
+        Graph.build()
+        |> Text.add_to_graph("text one", id: {:a, :one})
+        |> Text.add_to_graph("text two", id: {:a, :two})
+        |> Text.add_to_graph("text three", id: {:b, :three})
+
+      # confirm result
+      assert Graph.find(graph, &match?({:a, :one}, &1.id)) == [
+        Graph.get!(graph, {:a, :one})
+      ]
+
+      assert Graph.find(graph, &match?({:b, :three}, &1.id)) == [
+        Graph.get!(graph, {:b, :three})
+      ]
+    end
+
+  # ============================================================================
+  test "find_by_id returns the matching items" do
     graph =
       Graph.build()
       |> Text.add_to_graph("text one", id: {:a, :one})
       |> Text.add_to_graph("text two", id: {:a, :two})
       |> Text.add_to_graph("text three", id: {:b, :three})
 
     # confirm result
-    assert Graph.find(graph, &match?({:a, _}, &1)) == [
+    assert Graph.find_by_id(graph, &match?({:a, _}, &1)) == [
              Graph.get!(graph, {:a, :one}),
              Graph.get!(graph, {:a, :two})
            ]
 
-    assert Graph.find(graph, &match?({:b, _}, &1)) == [
+    assert Graph.find_by_id(graph, &match?({:b, _}, &1)) == [
              Graph.get!(graph, {:b, :three})
            ]
   end