Consolidate two subgame root tests into a single path-based verification

Author: d-kad

tests/test_node.py

@@ -199,43 +199,8 @@ def test_node_own_prior_action_non_terminal(game_file, expected_node_data):
 
 
 # ==============================================================================
-#                   New Test Suite for the Subgame Root Checker
+#                    Test Suite for the Subgame Root Checker
 # ==============================================================================
-
-@pytest.mark.parametrize("game, expected_result", [
-    # Games without Absent-Mindedness for which the legacy method is known to be correct.
-    (games.read_from_file("wichardt.efg"), {0}),
-    (games.read_from_file("e02.efg"), {0, 2, 4}),
-    (games.read_from_file("subgame-roots-finder-one-merge.efg"), {0, 2}),
-    (
-        games.read_from_file("subgame-roots-finder-multiple-roots-and-merge.efg"),
-        {0, 1, 4, 7, 11, 13, 34}
-    ),
-    (games.Centipede.get_test_data(N=5, m0=2, m1=7)[0], {0, 2, 4, 6, 8}),
-    (gbt.Game.new_tree(), {}),
-    (games.read_from_file("subgame-roots-finder-multiple-merges.efg"), {0, 2, 13, 15}),
-
-    # Games with Absent-Mindedness where the legacy method is known to fail.
-    pytest.param(
-        games.read_from_file("AM-subgames.efg"),
-        {0, 2, 5, 8},  # The correct set of roots
-        marks=pytest.mark.xfail(
-            reason="Legacy method does not detect subgame roots that are members of AM-infosets."
-        )
-    ),
-])
-def test_legacy_is_subgame_root_set(game: gbt.Game, expected_result: set):
-    """
-    Tests the legacy `node.is_subgame_root` against an expected set of nodes.
-    Includes both passing cases and games with Absent-Mindedness where it is expected to fail.
-    """
-    list_nodes = list(game.nodes)
-    expected_roots = {list_nodes[i] for i in expected_result}
-    legacy_roots = {node for node in game.nodes if node.is_subgame_root}
-    assert legacy_roots == expected_roots
-
-
-# NEW subgame finder algorithm
 @pytest.mark.parametrize("game, expected_paths_list", [
     # Empty game has no subgames
     (
@@ -323,21 +288,17 @@ def test_legacy_is_subgame_root_set(game: gbt.Game, expected_result: set):
         ]
     ),
 ])
-def test_new_subgame_root_method_paths(game: gbt.Game, expected_paths_list: list):
+def test_subgame_root_consistency(game: gbt.Game, expected_paths_list: list):
     """
-    Tests `game.subgame_root()` by comparing the paths of the identified root nodes
-    against the expected paths.
+    Tests `game.subgame_root` and `node.is_subgame_root` for consistency and correctness
+    by comparing the paths of the identified root nodes against the expected paths.
     """
-    actual_root_nodes = {
-        game.subgame_root(infoset)
-        for infoset in game.infosets
-        if not infoset.is_chance
-    }
-
-    actual_paths = [
-        _get_path_of_action_labels(node)
-        for node in actual_root_nodes
-    ]
+    roots_from_lookup = {game.subgame_root(infoset) for infoset in game.infosets}
+    roots_from_property = {node for node in game.nodes if node.is_subgame_root}
+
+    assert roots_from_lookup == roots_from_property
+
+    actual_paths = [_get_path_of_action_labels(node) for node in roots_from_lookup]
 
     assert sorted(actual_paths) == sorted(expected_paths_list)