1.1 --- a/tests/test_tree.c Mon Feb 19 22:08:09 2024 +0100
1.2 +++ b/tests/test_tree.c Mon Feb 19 22:09:16 2024 +0100
1.3 @@ -250,7 +250,7 @@
1.4 }
1.5 }
1.6
1.7 -CX_TEST(test_tree_iterator_create) {
1.8 +CX_TEST(test_tree_iterator_create_and_dispose) {
1.9 tree_node root;
1.10 CX_TEST_DO {
1.11 CxTreeIterator iter = cx_tree_iterator(&root, false, tree_child_list);
1.12 @@ -266,6 +266,58 @@
1.13 CX_TEST_ASSERT(iter.depth == 1);
1.14 CX_TEST_ASSERT(iter.loc_next == offsetof(tree_node, next));
1.15 CX_TEST_ASSERT(iter.loc_children == offsetof(tree_node, children));
1.16 + cxTreeIteratorDispose(&iter);
1.17 + CX_TEST_ASSERT(iter.stack == NULL);
1.18 + }
1.19 +}
1.20 +
1.21 +CX_TEST(test_tree_iterator_basic_test_only_enter) {
1.22 + tree_node root = {0};
1.23 + tree_node a = {0};
1.24 + tree_node b = {0};
1.25 + tree_node c = {0};
1.26 + tree_node aa = {0};
1.27 + tree_node ab = {0};
1.28 + tree_node ba = {0};
1.29 + tree_node ca = {0};
1.30 + tree_node cb = {0};
1.31 + tree_node cc = {0};
1.32 + tree_node cba = {0};
1.33 +
1.34 + cx_tree_link(&root, &a, tree_node_layout);
1.35 + cx_tree_link(&root, &b, tree_node_layout);
1.36 + cx_tree_link(&root, &c, tree_node_layout);
1.37 + cx_tree_link(&a, &aa, tree_node_layout);
1.38 + cx_tree_link(&a, &ab, tree_node_layout);
1.39 + cx_tree_link(&b, &ba, tree_node_layout);
1.40 + cx_tree_link(&c, &ca, tree_node_layout);
1.41 + cx_tree_link(&c, &cb, tree_node_layout);
1.42 + cx_tree_link(&c, &cc, tree_node_layout);
1.43 + cx_tree_link(&cb, &cba, tree_node_layout);
1.44 + CX_TEST_DO {
1.45 + CxTreeIterator iter = cx_tree_iterator(&root, false, tree_child_list);
1.46 + unsigned chk = 0;
1.47 + cx_foreach(tree_node*, node, iter) {
1.48 + CX_TEST_ASSERT(node->data == 0);
1.49 + node->data++;
1.50 + chk++;
1.51 + CX_TEST_ASSERT(node == iter.node);
1.52 + CX_TEST_ASSERT(!iter.exiting);
1.53 + }
1.54 + CX_TEST_ASSERT(iter.counter == 11);
1.55 + CX_TEST_ASSERT(chk == 11);
1.56 + CX_TEST_ASSERT(iter.stack == NULL);
1.57 + CX_TEST_ASSERT(root.data == 1);
1.58 + CX_TEST_ASSERT(a.data == 1);
1.59 + CX_TEST_ASSERT(b.data == 1);
1.60 + CX_TEST_ASSERT(c.data == 1);
1.61 + CX_TEST_ASSERT(aa.data == 1);
1.62 + CX_TEST_ASSERT(ab.data == 1);
1.63 + CX_TEST_ASSERT(ba.data == 1);
1.64 + CX_TEST_ASSERT(ca.data == 1);
1.65 + CX_TEST_ASSERT(cb.data == 1);
1.66 + CX_TEST_ASSERT(cc.data == 1);
1.67 + CX_TEST_ASSERT(cba.data == 1);
1.68 }
1.69 }
1.70
1.71 @@ -277,7 +329,8 @@
1.72 cx_test_register(suite, test_tree_link_move_to_other_parent);
1.73 cx_test_register(suite, test_tree_unlink);
1.74 cx_test_register(suite, test_tree_search);
1.75 - cx_test_register(suite, test_tree_iterator_create);
1.76 + cx_test_register(suite, test_tree_iterator_create_and_dispose);
1.77 + cx_test_register(suite, test_tree_iterator_basic_test_only_enter);
1.78
1.79 return suite;
1.80 }
