d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve tree(3) tests by using ATF_REQUIRE where applicable.

Browse Source 
MFC after:	2 weeks
Sponsored by:	Klara Inc.
This commit is contained in:
Edward Tomasz Napierala 2019-05-20 18:35:23 +00:00
parent d08b7fa2e5
commit 849f6862ff
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/sys/sys/rb_test.c
View File

@ -69,7 +69,7 @@ ATF_TC_BODY(rb_test, tc)
for (i = 0; i < ITER; i++) {
tmp = malloc(sizeof(struct node));
ATF_CHECK_MSG(tmp != NULL, "malloc failed");
ATF_REQUIRE_MSG(tmp != NULL, "malloc failed");
do {
tmp->key = arc4random_uniform(MAX-MIN);
tmp->key += MIN;
@ -82,20 +82,22 @@ ATF_TC_BODY(rb_test, tc)
if (tmp->key < min)
min = tmp->key;
}
ATF_CHECK_EQ(NULL, RB_INSERT(tree, &root, tmp));
ATF_REQUIRE_EQ(NULL, RB_INSERT(tree, &root, tmp));
}
ins = RB_MIN(tree, &root);
ATF_REQUIRE_MSG(ins != NULL, "RB_MIN error");
ATF_CHECK_EQ(min, ins->key);
tmp = ins;
ins = RB_MAX(tree, &root);
ATF_REQUIRE_MSG(ins != NULL, "RB_MAX error");
ATF_CHECK_EQ(max, ins->key);
ATF_CHECK_EQ(tmp, RB_REMOVE(tree, &root, tmp));
for (i = 0; i < ITER - 1; i++) {
tmp = RB_ROOT(&root);
ATF_CHECK_MSG(tmp != NULL, "RB_ROOT error");
ATF_REQUIRE_MSG(tmp != NULL, "RB_ROOT error");
ATF_CHECK_EQ(tmp, RB_REMOVE(tree, &root, tmp));
free(tmp);
}

8
tests/sys/sys/splay_test.c
View File

@ -69,7 +69,7 @@ ATF_TC_BODY(splay_test, tc)
for (i = 0; i < ITER; i++) {
tmp = malloc(sizeof(struct node));
ATF_CHECK_MSG(tmp != NULL, "malloc failed");
ATF_REQUIRE_MSG(tmp != NULL, "malloc failed");
do {
tmp->key = arc4random_uniform(MAX-MIN);
tmp->key += MIN;
@ -82,20 +82,22 @@ ATF_TC_BODY(splay_test, tc)
if (tmp->key < min)
min = tmp->key;
}
ATF_CHECK_EQ(NULL, SPLAY_INSERT(tree, &root, tmp));
ATF_REQUIRE_EQ(NULL, SPLAY_INSERT(tree, &root, tmp));
}
ins = SPLAY_MIN(tree, &root);
ATF_REQUIRE_MSG(ins != NULL, "SPLAY_MIN error");
ATF_CHECK_EQ(min, ins->key);
tmp = ins;
ins = SPLAY_MAX(tree, &root);
ATF_REQUIRE_MSG(ins != NULL, "SPLAY_MAX error");
ATF_CHECK_EQ(max, ins->key);
ATF_CHECK_EQ(tmp, SPLAY_REMOVE(tree, &root, tmp));
for (i = 0; i < ITER - 1; i++) {
tmp = SPLAY_ROOT(&root);
ATF_CHECK_MSG(tmp != NULL, "SPLAY_ROOT error");
ATF_REQUIRE_MSG(tmp != NULL, "SPLAY_ROOT error");
ATF_CHECK_EQ(tmp, SPLAY_REMOVE(tree, &root, tmp));
free(tmp);
}