Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add aggregate param to tree_diff #323

Merged
merged 3 commits into from
Nov 6, 2024
Merged

Add aggregate param to tree_diff #323

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41154a0
test: refactor tests
kayjan Nov 6, 2024
be4779f
feat: get_tree_diff to allow 'aggregate' parameter
kayjan Nov 6, 2024
adae847
test: refactor fixtures
kayjan Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 59 additions & 48 deletions tests/tree/test_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ class TestTreeDiff:
@staticmethod
def test_tree_diff(tree_node):
other_tree_node = helper.prune_tree(tree_node, "a/c")
_ = node.Node("d", parent=other_tree_node)
tree_only_diff = helper.get_tree_diff(tree_node, other_tree_node)
node.Node("d", parent=other_tree_node, children=[node.Node("e")])
tree_diff = helper.get_tree_diff(tree_node, other_tree_node)
expected_str = (
"a\n"
"├── b (-)\n"
Expand All @@ -232,16 +232,17 @@ def test_tree_diff(tree_node):
"│ ├── g (-)\n"
"│ └── h (-)\n"
"└── d (+)\n"
" └── e (+)\n"
)
assert_print_statement(export.print_tree, expected_str, tree=tree_only_diff)
assert_print_statement(export.print_tree, expected_str, tree=tree_diff)

@staticmethod
def test_tree_diff_same_prefix():
tree_node = node.Node(
"a", children=[node.Node("bb", children=[node.Node("b")])]
)
other_tree_node = node.Node("a", children=[node.Node("b")])
tree_only_diff = helper.get_tree_diff(tree_node, other_tree_node)
tree_diff = helper.get_tree_diff(tree_node, other_tree_node)
# fmt: off
expected_str = (
"a\n"
Expand All @@ -250,7 +251,7 @@ def test_tree_diff_same_prefix():
" └── b (-)\n"
)
# fmt: on
assert_print_statement(export.print_tree, expected_str, tree=tree_only_diff)
assert_print_statement(export.print_tree, expected_str, tree=tree_diff)

@staticmethod
def test_tree_diff_diff_sep_error(tree_node):
Expand All @@ -263,18 +264,18 @@ def test_tree_diff_diff_sep_error(tree_node):
@staticmethod
def test_tree_diff_sep_clash_with_node_name_error(tree_node):
other_tree_node = helper.prune_tree(tree_node, "a/c")
_ = node.Node("/d", parent=other_tree_node)
node.Node("/d", parent=other_tree_node)
with pytest.raises(exceptions.TreeError) as exc_info:
helper.get_tree_diff(tree_node, other_tree_node)
assert str(exc_info.value) == Constants.ERROR_NODE_NAME

@staticmethod
def test_tree_diff_sep_clash_with_node_name(tree_node):
other_tree_node = helper.prune_tree(tree_node, "a/c")
_ = node.Node("/d", parent=other_tree_node)
node.Node("/d", parent=other_tree_node)
tree_node.sep = "."
other_tree_node.sep = "."
tree_only_diff = helper.get_tree_diff(tree_node, other_tree_node)
tree_diff = helper.get_tree_diff(tree_node, other_tree_node)
expected_str = (
"a\n"
"├── /d (+)\n"
Expand All @@ -284,16 +285,16 @@ def test_tree_diff_sep_clash_with_node_name(tree_node):
" ├── g (-)\n"
" └── h (-)\n"
)
assert_print_statement(export.print_tree, expected_str, tree=tree_only_diff)
assert_print_statement(export.print_tree, expected_str, tree=tree_diff)

@staticmethod
def test_tree_diff_forbidden_sep(tree_node):
other_tree_node = helper.prune_tree(tree_node, "a/c")
_ = node.Node("d", parent=other_tree_node)
node.Node("d", parent=other_tree_node, children=[node.Node("e")])
for symbol in [".", "-", "+", "~"]:
tree_node.sep = symbol
other_tree_node.sep = symbol
tree_only_diff = helper.get_tree_diff(tree_node, other_tree_node)
tree_diff = helper.get_tree_diff(tree_node, other_tree_node)
expected_str = (
"a\n"
"├── b (-)\n"
Expand All @@ -302,29 +303,14 @@ def test_tree_diff_forbidden_sep(tree_node):
"│ ├── g (-)\n"
"│ └── h (-)\n"
"└── d (+)\n"
" └── e (+)\n"
)
assert_print_statement(export.print_tree, expected_str, tree=tree_only_diff)

@staticmethod
def test_tree_diff_detail(tree_node):
other_tree_node = helper.prune_tree(tree_node, "a/c")
_ = node.Node("i", parent=other_tree_node)
tree_only_diff = helper.get_tree_diff(tree_node, other_tree_node, detail=True)
expected_str = (
"a\n"
"├── b (removed)\n"
"│ ├── d (removed)\n"
"│ └── e (removed)\n"
"│ ├── g (removed)\n"
"│ └── h (removed)\n"
"└── i (added)\n"
)
assert_print_statement(export.print_tree, expected_str, tree=tree_only_diff)
assert_print_statement(export.print_tree, expected_str, tree=tree_diff)

@staticmethod
def test_tree_diff_all_diff(tree_node):
other_tree_node = helper.prune_tree(tree_node, "a/c")
_ = node.Node("d", parent=other_tree_node)
node.Node("d", parent=other_tree_node, children=[node.Node("e")])
tree_diff = helper.get_tree_diff(tree_node, other_tree_node, only_diff=False)
expected_str = (
"a\n"
Expand All @@ -336,26 +322,24 @@ def test_tree_diff_all_diff(tree_node):
"├── c\n"
"│ └── f\n"
"└── d (+)\n"
" └── e (+)\n"
)
assert_print_statement(export.print_tree, expected_str, tree=tree_diff)

@staticmethod
def test_tree_diff_all_diff_detail(tree_node):
def test_tree_diff_detail(tree_node):
other_tree_node = helper.prune_tree(tree_node, "a/c")
_ = node.Node("i", parent=other_tree_node)
tree_diff = helper.get_tree_diff(
tree_node, other_tree_node, only_diff=False, detail=True
)
node.Node("i", parent=other_tree_node, children=[node.Node("j")])
tree_diff = helper.get_tree_diff(tree_node, other_tree_node, detail=True)
expected_str = (
"a\n"
"├── b (removed)\n"
"│ ├── d (removed)\n"
"│ └── e (removed)\n"
"│ ├── g (removed)\n"
"│ └── h (removed)\n"
"├── c\n"
"│ └── f\n"
"└── i (added)\n"
" └── j (added)\n"
)
assert_print_statement(export.print_tree, expected_str, tree=tree_diff)

Expand All @@ -365,8 +349,8 @@ def test_tree_diff_detail_move(tree_node):
modify.shift_nodes(
other_tree_node, from_paths=["a/b/d", "a/b"], to_paths=[None, "a/c/b"]
)
_ = node.Node("i", parent=other_tree_node)
tree_only_diff = helper.get_tree_diff(tree_node, other_tree_node, detail=True)
node.Node("i", parent=other_tree_node, children=[node.Node("j")])
tree_diff = helper.get_tree_diff(tree_node, other_tree_node, detail=True)
expected_str = (
"a\n"
"├── b (moved from)\n"
Expand All @@ -380,26 +364,53 @@ def test_tree_diff_detail_move(tree_node):
"│ ├── g (moved to)\n"
"│ └── h (moved to)\n"
"└── i (added)\n"
" └── j (added)\n"
)
assert_print_statement(export.print_tree, expected_str, tree=tree_only_diff)
assert_print_statement(export.print_tree, expected_str, tree=tree_diff)

@staticmethod
def test_tree_diff_all_diff_detail(tree_node):
other_tree_node = helper.prune_tree(tree_node, "a/c")
node.Node("i", parent=other_tree_node, children=[node.Node("j")])
tree_diff = helper.get_tree_diff(
tree_node, other_tree_node, only_diff=False, detail=True
)
expected_str = (
"a\n"
"├── b (removed)\n"
"│ ├── d (removed)\n"
"│ └── e (removed)\n"
"│ ├── g (removed)\n"
"│ └── h (removed)\n"
"├── c\n"
"│ └── f\n"
"└── i (added)\n"
" └── j (added)\n"
)
assert_print_statement(export.print_tree, expected_str, tree=tree_diff)

@staticmethod
def test_tree_diff_new_leaf(tree_node):
other_tree_node = tree_node.copy()
tree_node_new_parent = other_tree_node["c"]["f"]
_ = node.Node("i", parent=tree_node_new_parent)
tree_only_diff = helper.get_tree_diff(tree_node, other_tree_node)
expected_str = "a\n" "└── c\n" " └── f\n" " └── i (+)\n"
assert_print_statement(export.print_tree, expected_str, tree=tree_only_diff)
node.Node("i", parent=tree_node_new_parent)
tree_diff = helper.get_tree_diff(tree_node, other_tree_node)
# fmt: off
expected_str = (
"a\n"
"└── c\n"
" └── f\n"
" └── i (+)\n"
)
# fmt: on
assert_print_statement(export.print_tree, expected_str, tree=tree_diff)

@staticmethod
def test_tree_diff_new_leaf_all_diff(tree_node):
other_tree_node = tree_node.copy()
tree_node_new_parent = other_tree_node["c"]["f"]
_ = node.Node("i", parent=tree_node_new_parent)
tree_only_diff = helper.get_tree_diff(
tree_node, other_tree_node, only_diff=False
)
node.Node("i", parent=tree_node_new_parent)
tree_diff = helper.get_tree_diff(tree_node, other_tree_node, only_diff=False)
expected_str = (
"a\n"
"├── b\n"
Expand All @@ -411,7 +422,7 @@ def test_tree_diff_new_leaf_all_diff(tree_node):
" └── f\n"
" └── i (+)\n"
)
assert_print_statement(export.print_tree, expected_str, tree=tree_only_diff)
assert_print_statement(export.print_tree, expected_str, tree=tree_diff)

@staticmethod
def test_tree_diff_same_tree(tree_node):
Expand Down
Loading