archive/archived
Archived
1
0
Fork 0
Code Activity

common/rbtree: fixed a bug in delete

Browse source
This commit is contained in:
Henrik Hautakoski 2010-10-02 08:20:48 +02:00
parent 8d7b4a74c7
commit 7209cfb1c4
7 changed files with 52 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/Makefile
View file

@ -28,6 +28,7 @@ rbtree :
$(CC) $(CFLAGS) \
unit.c \
../src/common/die.c \
../src/common/xalloc.c \
../src/common/rbtree.c \
t_rbtree.c -o test_rbtree

13
test/t_rbtree.c
View file

@ -60,7 +60,8 @@ static int rb_assert(rbnode *node) {
/* data */
static rbtree tree;
static uint keyref[NODES];
static uint keyref[NODES];
static char *dataref[NODES];
static uint search_key = -1;
static char search_data[32];
@ -79,7 +80,7 @@ void test_insert() {
data = utest_ran_string(32);
/* insert into rbtree and assert it */
ret = rbtree_insert(&tree, ckey, data);
ret = rbtree_insert(&tree, ckey, data, 32);
rb_assert(tree.root);
dprint("INSERT: %i %s\n", ckey, data);
@ -89,6 +90,7 @@ void test_insert() {
continue;
keyref[i] = ckey;
dataref[i] = data;
if (i == ((NODES/2))) {
search_key = ckey;
@ -99,7 +101,7 @@ void test_insert() {
}
/* insert duplicate key */
assert(rbtree_insert(&tree, search_key, "duplicate") == -1);
assert(rbtree_insert(&tree, search_key, "duplicate", 10) == -1);
rb_assert(tree.root);
}
@ -107,13 +109,16 @@ void test_delete() {
int i;
uint key;
char *data, *dref;
/* remove some values */
for(i=0; i < 10; i++) {
key = keyref[(NODES/2)+i];
dref = dataref[(NODES/2)+i];
rbtree_delete(&tree, key);
data = rbtree_delete(&tree, key);
assert_string(data, dref);
rb_assert(tree.root);
}
}