diff -r 1defab20b477 -r 392ec9026b07 src/server/test/main.c --- a/src/server/test/main.c Sat Nov 22 12:49:20 2025 +0100 +++ b/src/server/test/main.c Sat Nov 22 14:27:01 2025 +0100 @@ -51,7 +51,7 @@ #include "io.h" #include "event.h" -void register_pg_tests(int argc, char **argv, UcxTestSuite *suite); +void register_pg_tests(int argc, char **argv, CxTestSuite *suite); void test() { @@ -70,106 +70,106 @@ //test(); - printf("%s", "Webserver Test Suite\n====================\n\n"); + //printf("%s", "Webserver Test Suite\n====================\n\n"); - UcxTestSuite* suite = ucx_test_suite_new(); + CxTestSuite *suite = cx_test_suite_new("webserver"); // util tests - ucx_test_register(suite, test_util_uri_escape_alphanum); - ucx_test_register(suite, test_util_uri_escape_space); - ucx_test_register(suite, test_util_uri_escape_latin); - ucx_test_register(suite, test_util_uri_escape_kanji); + cx_test_register(suite, test_util_uri_escape_alphanum); + cx_test_register(suite, test_util_uri_escape_space); + cx_test_register(suite, test_util_uri_escape_latin); + cx_test_register(suite, test_util_uri_escape_kanji); // event tests - ucx_test_register(suite, test_evhandler_create); - ucx_test_register(suite, test_event_send); - ucx_test_register(suite, test_event_send_multi); + cx_test_register(suite, test_evhandler_create); + cx_test_register(suite, test_event_send); + cx_test_register(suite, test_event_send_multi); // object tests - ucx_test_register(suite, test_expr_parse_expr_value); - ucx_test_register(suite, test_expr_parse_expr_neg_value); - ucx_test_register(suite, test_expr_parse_expr_value_str); - ucx_test_register(suite, test_expr_parse_expr_value_bool); - ucx_test_register(suite, test_expr_parse_expr_value_var); - ucx_test_register(suite, test_expr_parse_expr_not_value); - ucx_test_register(suite, test_expr_parse_expr_sign_value); - ucx_test_register(suite, test_expr_parse_expr_compare2values); - ucx_test_register(suite, test_expr_parse_expr_compare2value_expr); - ucx_test_register(suite, test_expr_parse_expr_compare2expr_value); - ucx_test_register(suite, test_expr_parse_expr_bracket); - ucx_test_register(suite, test_expr_op_defined_simple); - ucx_test_register(suite, test_expr_op_defined); - ucx_test_register(suite, test_expr_op_file_exists_simple); - ucx_test_register(suite, test_expr_parse_expr_func_arg0); - ucx_test_register(suite, test_expr_parse_expr_func_arg1); - ucx_test_register(suite, test_expr_parse_expr_func_arg3); - ucx_test_register(suite, test_expr_parse_expr_func_expr1); - ucx_test_register(suite, test_expr_parse_expr_func_expr2); + cx_test_register(suite, test_expr_parse_expr_value); + cx_test_register(suite, test_expr_parse_expr_neg_value); + cx_test_register(suite, test_expr_parse_expr_value_str); + cx_test_register(suite, test_expr_parse_expr_value_bool); + cx_test_register(suite, test_expr_parse_expr_value_var); + cx_test_register(suite, test_expr_parse_expr_not_value); + cx_test_register(suite, test_expr_parse_expr_sign_value); + cx_test_register(suite, test_expr_parse_expr_compare2values); + cx_test_register(suite, test_expr_parse_expr_compare2value_expr); + cx_test_register(suite, test_expr_parse_expr_compare2expr_value); + cx_test_register(suite, test_expr_parse_expr_bracket); + cx_test_register(suite, test_expr_op_defined_simple); + cx_test_register(suite, test_expr_op_defined); + cx_test_register(suite, test_expr_op_file_exists_simple); + cx_test_register(suite, test_expr_parse_expr_func_arg0); + cx_test_register(suite, test_expr_parse_expr_func_arg1); + cx_test_register(suite, test_expr_parse_expr_func_arg3); + cx_test_register(suite, test_expr_parse_expr_func_expr1); + cx_test_register(suite, test_expr_parse_expr_func_expr2); // io tests - ucx_test_register(suite, test_io_http_stream_parse_chunk_header_hdronly_first); - ucx_test_register(suite, test_io_http_stream_parse_chunk_header_hdronly); - ucx_test_register(suite, test_io_http_stream_parse_chunk_header_hdronly_seq_fail); - ucx_test_register(suite, test_io_http_stream_parse_chunk_header_hdr_data); - ucx_test_register(suite, test_io_http_stream_parse_chunk_header_empty); - ucx_test_register(suite, test_io_http_stream_parse_chunk_header_partial_first); - ucx_test_register(suite, test_io_http_stream_parse_chunk_header_partial); - ucx_test_register(suite, test_io_http_stream_parse_chunk_header_invalid); - ucx_test_register(suite, test_io_http_stream_parse_chunk_header_zero); - ucx_test_register(suite, test_io_httpstream_write); - ucx_test_register(suite, test_io_httpstream_chunked_write); - ucx_test_register(suite, test_io_httpstream_chunked_write_end); - ucx_test_register(suite, test_io_httpstream_chunked_write_xx); - ucx_test_register(suite, test_io_httpstream_chunked_write_partial_header); - ucx_test_register(suite, test_io_httpstream_chunked_write_partial_data); - ucx_test_register(suite, test_io_httpstream_chunked_write_partial_trailer); - ucx_test_register(suite, test_io_httpstream_chunked_write_partial_trailer_partial_header); - ucx_test_register(suite, test_io_httpstream_chunked_write_data_2x); - ucx_test_register(suite, test_io_httpstream_chunked_write_xx_limit); + cx_test_register(suite, test_io_http_stream_parse_chunk_header_hdronly_first); + cx_test_register(suite, test_io_http_stream_parse_chunk_header_hdronly); + cx_test_register(suite, test_io_http_stream_parse_chunk_header_hdronly_seq_fail); + cx_test_register(suite, test_io_http_stream_parse_chunk_header_hdr_data); + cx_test_register(suite, test_io_http_stream_parse_chunk_header_empty); + cx_test_register(suite, test_io_http_stream_parse_chunk_header_partial_first); + cx_test_register(suite, test_io_http_stream_parse_chunk_header_partial); + cx_test_register(suite, test_io_http_stream_parse_chunk_header_invalid); + cx_test_register(suite, test_io_http_stream_parse_chunk_header_zero); + cx_test_register(suite, test_io_httpstream_write); + cx_test_register(suite, test_io_httpstream_chunked_write); + cx_test_register(suite, test_io_httpstream_chunked_write_end); + cx_test_register(suite, test_io_httpstream_chunked_write_xx); + cx_test_register(suite, test_io_httpstream_chunked_write_partial_header); + cx_test_register(suite, test_io_httpstream_chunked_write_partial_data); + cx_test_register(suite, test_io_httpstream_chunked_write_partial_trailer); + cx_test_register(suite, test_io_httpstream_chunked_write_partial_trailer_partial_header); + cx_test_register(suite, test_io_httpstream_chunked_write_data_2x); + cx_test_register(suite, test_io_httpstream_chunked_write_xx_limit); // vfs tests - ucx_test_register(suite, test_vfs_open); - ucx_test_register(suite, test_vfs_mkdir); - ucx_test_register(suite, test_vfs_opendir); - ucx_test_register(suite, test_vfs_readdir); - ucx_test_register(suite, test_vfs_unlink); - ucx_test_register(suite, test_vfs_rmdir); + cx_test_register(suite, test_vfs_open); + cx_test_register(suite, test_vfs_mkdir); + cx_test_register(suite, test_vfs_opendir); + cx_test_register(suite, test_vfs_readdir); + cx_test_register(suite, test_vfs_unlink); + cx_test_register(suite, test_vfs_rmdir); // writer tests - ucx_test_register(suite, test_writer_putc); - ucx_test_register(suite, test_writer_flush); - ucx_test_register(suite, test_writer_put); + cx_test_register(suite, test_writer_putc); + cx_test_register(suite, test_writer_flush); + cx_test_register(suite, test_writer_put); // xml tests - ucx_test_register(suite, test_wsxml_iterator); - ucx_test_register(suite, test_wsxml_get_required_namespaces); - ucx_test_register(suite, test_wsxml_write_nodes); - ucx_test_register(suite, test_wsxml_nslist2string); - ucx_test_register(suite, test_wsxml_string2nslist); + cx_test_register(suite, test_wsxml_iterator); + cx_test_register(suite, test_wsxml_get_required_namespaces); + cx_test_register(suite, test_wsxml_write_nodes); + cx_test_register(suite, test_wsxml_nslist2string); + cx_test_register(suite, test_wsxml_string2nslist); // webdav tests - ucx_test_register(suite, test_webdav_plist_add); - ucx_test_register(suite, test_webdav_plist_size); - ucx_test_register(suite, test_propfind_parse); - ucx_test_register(suite, test_proppatch_parse); - ucx_test_register(suite, test_lock_parse); - ucx_test_register(suite, test_rqbody2buffer); - ucx_test_register(suite, test_webdav_plist_iterator); - ucx_test_register(suite, test_webdav_plist_iterator_remove_current); - ucx_test_register(suite, test_msresponse_addproperty); - ucx_test_register(suite, test_webdav_propfind_init); - ucx_test_register(suite, test_webdav_op_propfind_begin); - ucx_test_register(suite, test_webdav_op_propfind_children); - ucx_test_register(suite, test_proppatch_msresponse); - ucx_test_register(suite, test_msresponse_addproperty_with_errors); - ucx_test_register(suite, test_webdav_op_proppatch); - ucx_test_register(suite, test_webdav_vfs_op_do); - ucx_test_register(suite, test_webdav_delete); + cx_test_register(suite, test_webdav_plist_add); + cx_test_register(suite, test_webdav_plist_size); + cx_test_register(suite, test_propfind_parse); + cx_test_register(suite, test_proppatch_parse); + cx_test_register(suite, test_lock_parse); + cx_test_register(suite, test_rqbody2buffer); + cx_test_register(suite, test_webdav_plist_iterator); + cx_test_register(suite, test_webdav_plist_iterator_remove_current); + cx_test_register(suite, test_msresponse_addproperty); + cx_test_register(suite, test_webdav_propfind_init); + cx_test_register(suite, test_webdav_op_propfind_begin); + cx_test_register(suite, test_webdav_op_propfind_children); + cx_test_register(suite, test_proppatch_msresponse); + cx_test_register(suite, test_msresponse_addproperty_with_errors); + cx_test_register(suite, test_webdav_op_proppatch); + cx_test_register(suite, test_webdav_vfs_op_do); + cx_test_register(suite, test_webdav_delete); // webdav methods - ucx_test_register(suite, test_webdav_propfind); - ucx_test_register(suite, test_webdav_proppatch); - ucx_test_register(suite, test_webdav_put); + cx_test_register(suite, test_webdav_propfind); + cx_test_register(suite, test_webdav_proppatch); + cx_test_register(suite, test_webdav_put); // plugin tests #ifdef ENABLE_POSTGRESQL @@ -177,7 +177,7 @@ #endif // run tests - ucx_test_run(suite, stdout); + cx_test_run_stdout(suite); fflush(stdout); return EXIT_SUCCESS;