@@ -26,13 +26,12 @@ static void check_increasing(void *arg, void *key)
c->last = key;
}
-static void test_tree(void)
+static void test_tree_search(void)
{
struct tree_node *root = NULL;
void *values[11] = { 0 };
struct tree_node *nodes[11] = { 0 };
size_t i = 1;
- struct curry c = { 0 };
do {
nodes[i] = tree_search(values + i, &root, &test_compare, 1);
@@ -44,13 +43,29 @@ static void test_tree(void)
check_pointer_eq(nodes[i], tree_search(values + i, &root, &test_compare, 0));
}
- infix_walk(root, check_increasing, &c);
+ tree_free(root);
+}
+
+static void test_infix_walk(void)
+{
+ struct tree_node *root = NULL;
+ void *values[11] = { 0 };
+ struct curry c = { 0 };
+ size_t i = 1;
+
+ do {
+ tree_search(values + i, &root, &test_compare, 1);
+ i = (i * 7) % 11;
+ } while (i != 1);
+
+ infix_walk(root, &check_increasing, &c);
tree_free(root);
}
int cmd_main(int argc, const char *argv[])
{
- TEST(test_tree(), "tree_search and infix_walk work");
+ TEST(test_tree_search(), "tree_search works");
+ TEST(test_infix_walk(), "infix_walk works");
return test_done();
}
In the current testing setup, tests for both tree_search() and infix_walk() defined by reftable/tree.{c, h} are performed by a single test function, test_tree(). Split tree_test() into test_tree_search() and test_infix_walk() responsible for independently testing tree_search() and infix_walk() respectively. This improves the overall readability of the test file as well as simplifies debugging. Note that the last parameter in the tree_search() functiom is 'int insert' which when set, inserts the key if it is not found in the tree. Otherwise, the function returns NULL for such cases. Mentored-by: Patrick Steinhardt <ps@pks.im> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com> --- t/unit-tests/t-reftable-tree.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)