Convert assert() in test code to assert_*().

This commit is contained in:
Jason Evans 2014-01-03 17:07:58 -08:00
parent 981bb499d9
commit 8cd0d94977

View File

@ -167,11 +167,17 @@ node_remove(tree_t *tree, node_t *node, unsigned nnodes)
/* Test rb_nsearch(). */ /* Test rb_nsearch(). */
search_node = tree_nsearch(tree, node); search_node = tree_nsearch(tree, node);
assert(search_node == NULL || search_node->key >= node->key); if (search_node != NULL) {
assert_u64_ge(search_node->key, node->key,
"Key ordering error");
}
/* Test rb_psearch(). */ /* Test rb_psearch(). */
search_node = tree_psearch(tree, node); search_node = tree_psearch(tree, node);
assert(search_node == NULL || search_node->key <= node->key); if (search_node != NULL) {
assert_u64_le(search_node->key, node->key,
"Key ordering error");
}
node->magic = 0; node->magic = 0;
@ -179,8 +185,10 @@ node_remove(tree_t *tree, node_t *node, unsigned nnodes)
imbalances = tree_recurse(tree->rbt_root, black_height, 0, imbalances = tree_recurse(tree->rbt_root, black_height, 0,
&(tree->rbt_nil)); &(tree->rbt_nil));
assert_u_eq(imbalances, 0, "Tree is unbalanced"); assert_u_eq(imbalances, 0, "Tree is unbalanced");
assert(nnodes - 1 == tree_iterate(tree)); assert_u_eq(tree_iterate(tree), nnodes-1,
assert(nnodes - 1 == tree_iterate_reverse(tree)); "Unexpected node iteration count");
assert_u_eq(tree_iterate_reverse(tree), nnodes-1,
"Unexpected node iteration count");
} }
static node_t * static node_t *