1.1 --- a/test/avl_tests.c Mon May 18 20:39:04 2015 +0200
1.2 +++ b/test/avl_tests.c Tue May 19 16:47:54 2015 +0200
1.3 @@ -157,19 +157,21 @@
1.4 ucx_avl_put(tree1, 2, (char*)data2);
1.5 ucx_avl_put(tree1, 1, (char*)data1);
1.6 ucx_avl_put(tree1, 3, (char*)data3);
1.7 - void *val = ucx_avl_remove(tree1, 3);
1.8 + void *val;
1.9 + ucx_avl_remove_s(tree1, 3, NULL, &val);
1.10
1.11 UCX_TEST_ASSERT(check_tree(tree1->root), "check_tree failed (tree1)");
1.12 - UCX_TEST_ASSERT(
1.13 - val == data3,
1.14 + UCX_TEST_ASSERT(val == data3,
1.15 "wrong return value for key: 1 (tree1)");
1.16 UCX_TEST_ASSERT(ucx_avl_get(tree1, 3) == NULL, "value not removed (tree1)");
1.17 - UCX_TEST_ASSERT(
1.18 - ucx_avl_remove(tree1, 2) == data2,
1.19 +
1.20 + ucx_avl_remove_s(tree1, 2, NULL, &val);
1.21 + UCX_TEST_ASSERT(val == data2,
1.22 "wrong return value for key: 2 (tree1)");
1.23 UCX_TEST_ASSERT(check_tree(tree1->root), "check_tree failed (tree1)");
1.24 - UCX_TEST_ASSERT(
1.25 - ucx_avl_remove(tree1, 1) == data1,
1.26 +
1.27 + ucx_avl_remove_s(tree1, 1, NULL, &val);
1.28 + UCX_TEST_ASSERT(val == data1,
1.29 "wrong return value for key: 1 (tree1)");
1.30 UCX_TEST_ASSERT(check_tree(tree1->root), "check_tree failed (tree1)");
1.31 UCX_TEST_ASSERT(tree1->root == NULL, "root not NULL (tree1)");
1.32 @@ -185,13 +187,13 @@
1.33 }
1.34 }
1.35
1.36 - UCX_TEST_ASSERT(
1.37 - ucx_avl_remove(tree2, 10) == data3,
1.38 + ucx_avl_remove_s(tree2, 10, NULL, &val);
1.39 + UCX_TEST_ASSERT(val == data3,
1.40 "wrong return value for key: 10 (tree2)");
1.41 UCX_TEST_ASSERT(check_tree(tree2->root), "check_tree failed (tree2)");
1.42
1.43 - UCX_TEST_ASSERT(
1.44 - ucx_avl_remove(tree2, 15) == data2,
1.45 + ucx_avl_remove_s(tree2, 15, NULL, &val);
1.46 + UCX_TEST_ASSERT(val == data2,
1.47 "wrong return value for key: 15 (tree2)");
1.48 UCX_TEST_ASSERT(check_tree(tree2->root), "check_tree failed (tree2)");
1.49
