Pull out pytests from algorithms doctest

Author: rocky

pymathics/graph/algorithms.py

@@ -32,13 +32,13 @@ class ConnectedComponents(_NetworkXBuiltin):
     </dl>
 
     >> g = Graph[{1 -> 2, 2 -> 3, 3 <-> 4}]; ConnectedComponents[g]
-     = {{3, 4}, {2}, {1}}
+     = ...
 
     >> g = Graph[{1 -> 2, 2 -> 3, 3 -> 1}]; ConnectedComponents[g]
-     = {{1, 2, 3}}
+     = ...
 
     >> g = Graph[{1 <-> 2, 2 <-> 3, 3 -> 4, 4 <-> 5}]; ConnectedComponents[g]
-     = {{4, 5}, {1, 2, 3}}
+     = ...
     """
 
     def eval(
@@ -102,17 +102,11 @@ class GraphDistance(_NetworkXBuiltin):
      = Infinity
 
     >> GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 2 <-> 4, 4 -> 5}, 3]
-     = {2, 1, 0, 1, 2}
+     = ...
 
     >> GraphDistance[{1 <-> 2, 3 <-> 4}, 3]
      = {Infinity, Infinity, 0, 1}
 
-    #> GraphDistance[{}, 1, 1]
-     : The vertex at position 2 in GraphDistance[{}, 1, 1] does not belong to the graph at position 1.
-     = GraphDistance[{}, 1, 1]
-    #> GraphDistance[{1 -> 2}, 3, 4]
-     : The vertex at position 2 in GraphDistance[{1 -> 2}, 3, 4] does not belong to the graph at position 1.
-     = GraphDistance[{1 -> 2}, 3, 4]
     """
 
     def eval_s(
@@ -203,7 +197,7 @@ class PlanarGraphQ(_NetworkXBuiltin):
     #> PlanarGraphQ[Graph[{}]]
      = False
 
-    
+
     >> PlanarGraphQ["abc"]
      : Expected a graph at position 1 in PlanarGraphQ[abc].
      = False

test/test_algorithms.py

@@ -13,23 +13,44 @@ def setup_module(module):
 
 def test_connected_components():
     for str_expr, str_expected in [
-            ("PlanarGraphQ[Graph[{}]]", "False"),
-            ("g = Graph[{1 -> 2, 2 -> 3, 3 <-> 4}];", "Null"),
-            ("SortList[ConnectedComponents[g]]", "{{1}, {2}, {3, 4}}"),
-            ("g = Graph[{1 -> 2, 2 -> 3, 3 -> 1}];", "Null"),
-            ("SortList[ConnectedComponents[g]]", "{{1, 2, 3}}"),
+        ("PlanarGraphQ[Graph[{}]]", "False"),
+        ("g = Graph[{1 -> 2, 2 -> 3, 3 <-> 4}];", "Null"),
+        ("SortList[ConnectedComponents[g]]", "{{1}, {2}, {3, 4}}"),
+        ("g = Graph[{1 -> 2, 2 -> 3, 3 -> 1}];", "Null"),
+        ("SortList[ConnectedComponents[g]]", "{{1, 2, 3}}"),
     ]:
         check_evaluation(str_expr, str_expected)
 
 
 def test_graph_distance():
-    for str_expr, str_expected in [
-        ("GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 2 <-> 4, 4 -> 5}, 1, 5]", "3"),
-        ("GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 4 -> 2, 4 -> 5}, 1, 5]", "4"),
+    for str_expr, str_expected, mess in [
+        (
+            "GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 2 <-> 4, 4 -> 5}, 1, 5]",
+            "3",
+            None,
+        ),
+        ("GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 4 -> 2, 4 -> 5}, 1, 5]", "4", None),
         # ("GraphDistance[{1 <-> 2, 2 <-> 3, 4 -> 3, 4 -> 2, 4 -> 5}, 1, 5]", "Infinity"),
         (
             "Sort[GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 2 <-> 4, 4 -> 5}, 3]]",
             "{0, 1, 1, 2, 2}",
+            None,
+        ),
+        (
+            "GraphDistance[{}, 1, 1]",
+            "GraphDistance[{}, 1, 1]",
+            [
+                "The vertex at position 2 in GraphDistance[{}, 1, 1] does not belong to "
+                "the graph at position 1."
+            ],
+        ),
+        (
+            "GraphDistance[{1 -> 2}, 3, 4]",
+            "GraphDistance[{1 -> 2}, 3, 4]",
+            [
+                "The vertex at position 2 in GraphDistance[{1 -> 2}, 3, 4] does not belong "
+                "to the graph at position 1."
+            ],
         ),
     ]:
-        check_evaluation(str_expr, str_expected)
+        check_evaluation(str_expr, str_expected, expected_messages=mess)

test/test_generators.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+"""
+Unit tests for mathics.builtins.numbers.algebra
+"""
+from test.helper import check_evaluation, evaluate, evaluate_value
+
+
+def setup_module(module):
+    """Load pymathics.graph"""
+    assert evaluate_value('LoadModule["pymathics.graph"]') == "pymathics.graph"
+    evaluate("SortList[list_] := Sort[Map[Sort, list]]")
+
+
+def test_connected_components():
+    for str_expr, str_expected in [
+        ("g = Graph[{1 -> 2, 2 -> 3, 3 <-> 4}];", "Null"),
+        ("SortList[ConnectedComponents[g]]", "{{1}, {2}, {3, 4}}"),
+        ("g = Graph[{1 -> 2, 2 -> 3, 3 -> 1}];", "Null"),
+        ("SortList[ConnectedComponents[g]]", "{{1, 2, 3}}"),
+    ]:
+        check_evaluation(str_expr, str_expected)
+
+
+def test_graph_distance():
+    for str_expr, str_expected in [
+        ("GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 2 <-> 4, 4 -> 5}, 1, 5]", "3"),
+        ("GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 4 -> 2, 4 -> 5}, 1, 5]", "4"),
+        # ("GraphDistance[{1 <-> 2, 2 <-> 3, 4 -> 3, 4 -> 2, 4 -> 5}, 1, 5]", "Infinity"),
+        (
+            "Sort[GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 2 <-> 4, 4 -> 5}, 3]]",
+            "{0, 1, 1, 2, 2}",
+        ),
+    ]:
+        check_evaluation(str_expr, str_expected)