diff -r 26541c37b619 -r 42cdbf9bbd49 test/main.c --- a/test/main.c Tue Oct 14 21:02:26 2025 +0200 +++ b/test/main.c Sat Nov 08 23:06:11 2025 +0100 @@ -29,14 +29,12 @@ #include #include -#include +#include "test.h" #include "base64.h" #include "crypto.h" #include "utils.h" -#include "test_resource.h" - int test_main(int argc, char **argv); #ifdef _WIN32 @@ -53,24 +51,21 @@ printf("libidav tests\n"); printf("-------------\n\n"); - CxTestSuite* suite = cx_test_suite_new("libidav"); + UcxTestSuite* suite = ucx_test_suite_new(); - cx_test_register(suite, test_util_base64decode); - cx_test_register(suite, test_util_base64decode_len); - cx_test_register(suite, test_util_base64encode); - cx_test_register(suite, test_util_decrypt_str_k); - cx_test_register(suite, test_util_encrypt_str_k); - cx_test_register(suite, test_crypto_buffer); - cx_test_register(suite, test_crypto_stream); - cx_test_register(suite, test_dav_pw2key); - cx_test_register(suite, test_util_parse_creationdate); + ucx_test_register(suite, test_util_base64decode); + ucx_test_register(suite, test_util_base64decode_len); + ucx_test_register(suite, test_util_base64encode); + ucx_test_register(suite, test_util_decrypt_str_k); + ucx_test_register(suite, test_util_encrypt_str_k); + ucx_test_register(suite, test_crypto_buffer); + ucx_test_register(suite, test_crypto_stream); + ucx_test_register(suite, test_dav_pw2key); + ucx_test_register(suite, test_util_parse_creationdate); - cx_test_register(suite, test_resource_iterator_visitor); - cx_test_register(suite, test_resource_map); - - cx_test_run(suite, stdout, (cx_write_func)fwrite); + ucx_test_run(suite, stdout); fflush(stdout); - cx_test_suite_free(suite); + ucx_test_suite_free(suite); return 0; }