zheiling/BBS-Client-TUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests and fixes for dlist_remove_by_ptr

Browse Source
This commit is contained in:
zheiling
2026-08-03 17:50:09 +03:00
parent 55994e9cb3
commit 43a1da856f
3 changed files with 94 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/utils/dlist.c
+62 -17
View File
@@ -2,6 +2,7 @@
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <utils/dlist.h>
@@ -11,6 +12,16 @@ typedef struct {
char buf[128];
} test_t;
bool dblist_add_cb(void *dst, void *src) {
// test_t *dst = _dst;
// test_t *src = _src;
memcpy(dst, src, sizeof(test_t));
return true;
}
#define tlist_add(dlist, item, prepend) \
dlist_add(dlist, item, test_t, dblist_add_cb, prepend);
#define LOREM_IPSUM \
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " \
"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim " \
@@ -23,7 +34,7 @@ typedef struct {
void test__init(void **state) {
test_t t = {.buf = "TEST BUF", .num = 123, .text = LOREM_IPSUM};
dlist_t *dlist = dlist_init(&t, test_t);
dlist_t *dlist = dlist_init(&t, test_t, dblist_add_cb);
assert_int_equal(dlist->len, 1);
test_t *dt_ptr = dlist->current->el_ptr;
assert_int_equal(dt_ptr->num, t.num);
@@ -36,11 +47,11 @@ void test__init__add_several_times(void **state) {
test_t t2 = {.buf = "TEST 1 BUF", .num = 11, .text = "RAND 1 TEXT"};
test_t t3 = {.buf = "TEST 2 BUF", .num = 22, .text = "RAND 2 TEXT"};
dlist_t *dlist = dlist_init(NULL, test_t);
dlist_t *dlist = dlist_init(NULL, test_t, NULL);
dlist_add(dlist, &t1, test_t, false);
dlist_add(dlist, &t2, test_t, false);
dlist_add(dlist, &t3, test_t, false);
dlist_add(dlist, &t1, test_t, dblist_add_cb, false);
dlist_add(dlist, &t2, test_t, dblist_add_cb, false);
dlist_add(dlist, &t3, test_t, dblist_add_cb, false);
assert_int_equal(dlist->len, 3);
@@ -58,11 +69,11 @@ void test__init__add_several_times_prepend(void **state) {
test_t t2 = {.buf = "TEST 1 BUF", .num = 11, .text = "RAND 1 TEXT"};
test_t t3 = {.buf = "TEST 2 BUF", .num = 22, .text = "RAND 2 TEXT"};
dlist_t *dlist = dlist_init(NULL, test_t);
dlist_t *dlist = dlist_init(NULL, test_t, NULL);
dlist_add(dlist, &t1, test_t, true);
dlist_add(dlist, &t2, test_t, true);
dlist_add(dlist, &t3, test_t, true);
dlist_add(dlist, &t1, test_t, dblist_add_cb, true);
dlist_add(dlist, &t2, test_t, dblist_add_cb, true);
dlist_add(dlist, &t3, test_t, dblist_add_cb, true);
assert_int_equal(dlist->len, 3);
@@ -80,11 +91,11 @@ void test__init__add_and_iterate(void **state) {
test_t t2 = {.buf = "TEST 1 BUF", .num = 11, .text = "RAND 1 TEXT"};
test_t t3 = {.buf = "TEST 2 BUF", .num = 22, .text = "RAND 2 TEXT"};
dlist_t *dlist = dlist_init(NULL, test_t);
dlist_t *dlist = dlist_init(NULL, test_t, NULL);
dlist_add(dlist, &t1, test_t, false);
dlist_add(dlist, &t2, test_t, false);
dlist_add(dlist, &t3, test_t, false);
dlist_add(dlist, &t1, test_t, dblist_add_cb, false);
dlist_add(dlist, &t2, test_t, dblist_add_cb, false);
dlist_add(dlist, &t3, test_t, dblist_add_cb, false);
test_t *dl_t3 = dlist_it_prev(dlist);
test_t *dl_t2 = dlist_it_prev(dlist);
@@ -110,12 +121,12 @@ void test__init__insert_sort(void **state) {
srand(time(NULL));
test_t t = {.text = T_TEXT};
dlist_t *dlist = dlist_init(NULL, test_t);
dlist_t *dlist = dlist_init(NULL, test_t, NULL);
for (int i = 0; i < T_IT_NUM; i++) {
sprintf(t.buf, "%s %d", T_BUF, i);
t.num = rand();
dlist_insert_sort(dlist, &t, test_t, _sort);
dlist_add_sort(dlist, &t, test_t, _sort, dblist_add_cb);
}
test_t *t1, *t2;
@@ -123,8 +134,8 @@ void test__init__insert_sort(void **state) {
t2 = dlist_it_prev(dlist);
t1 = dlist_it_prev(dlist);
assert_int_in_range(t2->num, t1->num, INT_MAX);\
assert_int_in_range(t2->num, t1->num, INT_MAX);
for (int i = T_IT_NUM - 2; i > 0; i--) {
t2 = t1;
t1 = dlist_it_prev(dlist);
@@ -132,6 +143,39 @@ void test__init__insert_sort(void **state) {
}
}
int delete_times = 0;
test_t *b_ptr = NULL;
bool delete_cb(void *el_ptr) {
assert_int_equal(b_ptr, el_ptr);
delete_times++;
return 1;
}
void test__init__remove_by_ptr(void **state) {
test_t ta = {.buf = "TEST A", .num = 123, .text = "TEXT A"};
test_t tb = {.buf = "TEST B", .num = 456, .text = "TEXT B"};
test_t tc = {.buf = "TEST C", .num = 789, .text = "TEXT C"};
dlist_t *dlist = dlist_init(NULL, int, NULL);
tlist_add(dlist, &ta, false);
tlist_add(dlist, &tb, false);
tlist_add(dlist, &tc, false);
b_ptr = dlist->start->next->el_ptr;
assert_int_equal(tb.num, 456);
dlist_remove_by_ptr(dlist, b_ptr, delete_cb);
assert_ptr_equal(dlist->start->next, dlist->current);
assert_ptr_equal(dlist->current->previous, dlist->start);
assert_int_equal(dlist->len, 2);
assert_int_equal(delete_times, 1);
test_t *a_ptr = dlist->start->el_ptr;
test_t *c_ptr = dlist->start->next->el_ptr;
assert_int_equal(a_ptr->num, 123);
assert_int_equal(c_ptr->num, 789);
}
int setup(void **state) { return 0; }
int tear_down(void **state) { return 0; }
@@ -142,6 +186,7 @@ int main(int argc, char **argv) {
cmocka_unit_test(test__init__add_several_times_prepend),
cmocka_unit_test(test__init__add_and_iterate),
cmocka_unit_test(test__init__insert_sort),
cmocka_unit_test(test__init__remove_by_ptr),
};