From: Alberto Leiva Popper Date: Wed, 29 Nov 2023 18:03:03 +0000 (-0600) Subject: Fix unit tests in the BSDs X-Git-Tag: 1.6.0~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f44a2ba335b933c46691824b06bd1378773da6fc;p=thirdparty%2FFORT-validator.git Fix unit tests in the BSDs ...Except for the __VA_ARGS__ warning. That can wait. --- diff --git a/test/rrdp_test.c b/test/rrdp_test.c index e87b892d..787e5cdb 100644 --- a/test/rrdp_test.c +++ b/test/rrdp_test.c @@ -8,12 +8,33 @@ /* Mocks */ +__MOCK_ABORT(base64_decode, bool, false, BIO *in, unsigned char *out, + bool has_nl, size_t out_len, size_t *out_written) +MOCK_ABORT_INT(cache_download, struct rpki_cache *cache, struct rpki_uri *uri, + bool *changed) +MOCK_ABORT_VOID(file_close, FILE *file) +MOCK_ABORT_INT(file_rm_rf, char const *path) +MOCK_ABORT_INT(file_write, char const *file_name, FILE **result) +MOCK_ABORT_INT(delete_dir_recursive_bottom_up, char const *path) +MOCK_ABORT_INT(mkdir_p, char const *path, bool include_basename) +MOCK_ABORT_VOID(fnstack_pop, void) +MOCK_ABORT_VOID(fnstack_push_uri, struct rpki_uri *uri) +MOCK_ABORT_INT(hash_validate_file, struct rpki_uri *uri, + unsigned char const *expected, size_t expected_len) +MOCK_ABORT_INT(relax_ng_parse, const char *path, xml_read_cb cb, void *arg) +MOCK_ABORT_PTR(state_retrieve, validation, void) +__MOCK_ABORT(tal_get_file_name, char const *, NULL, struct tal *tal) +MOCK_ABORT_INT(uri_create, struct rpki_uri **result, char const *tal, + enum uri_type type, struct rpki_uri *notif, char const *guri) +__MOCK_ABORT(uri_get_global, char const *, NULL, struct rpki_uri *uri) +__MOCK_ABORT(uri_get_local, char const *, NULL, struct rpki_uri *uri) +__MOCK_ABORT(uri_get_rrdp_workspace, char *, NULL, char const *tal, + struct rpki_uri *notif) MOCK_ABORT_PTR(uri_refget, rpki_uri, struct rpki_uri *uri) MOCK_VOID(uri_refput, struct rpki_uri *uri) -__MOCK_ABORT(uri_get_local, char const *, NULL, struct rpki_uri *uri) MOCK(uri_val_get_printable, char const *, "uri", struct rpki_uri *uri) -MOCK_ABORT_VOID(fnstack_push_uri, struct rpki_uri *uri) -MOCK_ABORT_VOID(fnstack_pop, void) +MOCK_ABORT_PTR(validation_cache, rpki_cache, struct validation *state) +MOCK_ABORT_PTR(validation_tal, tal, struct validation *state) /* Mocks end */ diff --git a/test/rtr/db/vrps_test.c b/test/rtr/db/vrps_test.c index 2a4f3679..74509208 100644 --- a/test/rtr/db/vrps_test.c +++ b/test/rtr/db/vrps_test.c @@ -69,6 +69,9 @@ static const bool deltas_4to4[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; unsigned int deltas_lifetime = 5; MOCK_UINT(config_get_deltas_lifetime, deltas_lifetime, void) +MOCK_ABORT_ENUM(config_get_output_format, output_format, void) +MOCK_ABORT_INT(hash_local_file, char const *uri, unsigned char *result, + unsigned int *result_len) /* Test functions */ diff --git a/test/tal_test.c b/test/tal_test.c index a873cb8e..635eefb3 100644 --- a/test/tal_test.c +++ b/test/tal_test.c @@ -13,34 +13,42 @@ /* Mocks */ +MOCK(cache_create, struct rpki_cache *, NULL, char const *tal) +MOCK_VOID(cache_destroy, struct rpki_cache *cache) +MOCK_ABORT_INT(cache_download, struct rpki_cache *cache, struct rpki_uri *uri, + bool *changed) +MOCK_ABORT_INT(cache_download_alt, struct rpki_cache *cache, + struct uri_list *uris, bool use_rrdp, uris_dl_cb cb, void *arg) +MOCK_ABORT_PTR(cache_recover, rpki_uri, struct rpki_cache *cache, + struct uri_list *uris, bool use_rrdp) +MOCK_ABORT_INT(certificate_traverse, struct rpp *rpp_parent, + struct rpki_uri *cert_uri) +MOCK_ABORT_PTR(db_table_create, db_table, void) +MOCK_VOID(db_table_destroy, struct db_table *table) +MOCK_ABORT_INT(db_table_join, struct db_table *dst, struct db_table *src) +MOCK_ABORT_INT(deferstack_pop, struct cert_stack *stack, + struct deferred_cert *result) +MOCK_ABORT_VOID(fnstack_cleanup, void) +MOCK_ABORT_VOID(fnstack_init, void) +MOCK_ABORT_VOID(fnstack_push, char const *f) MOCK_ABORT_INT(handle_roa_v4, uint32_t as, struct ipv4_prefix const *prefix, uint8_t max_length, void *arg) MOCK_ABORT_INT(handle_roa_v6, uint32_t as, struct ipv6_prefix const *prefix, uint8_t max_length, void *arg) MOCK_ABORT_INT(handle_router_key, unsigned char const *ski, struct asn_range const *asns, unsigned char const *spk, void *arg) - +MOCK_ABORT_INT(init_tmpdir, void) +MOCK_ABORT_VOID(rpp_refput, struct rpp *pp) +MOCK_ABORT_INT(rrdp_update, struct rpki_uri *uri) MOCK(state_retrieve, struct validation *, NULL, void) -MOCK(validation_tal, struct tal *, NULL, struct validation *state) +MOCK_ABORT_PTR(validation_certstack, cert_stack, struct validation *state) +MOCK_ABORT_VOID(validation_destroy, struct validation *state) MOCK_ABORT_PTR(validation_get_notification_uri, rpki_uri, struct validation *state) - -MOCK_ABORT_VOID(fnstack_init, void) -MOCK_ABORT_VOID(fnstack_cleanup, void) -MOCK_ABORT_VOID(fnstack_push, char const *f) - -MOCK(cache_create, struct rpki_cache *, NULL, char const *tal) -MOCK_VOID(cache_destroy, struct rpki_cache *cache) -MOCK_ABORT_INT(cache_download, struct rpki_cache *cache, struct rpki_uri *uri, - bool *changed) -MOCK_ABORT_INT(rrdp_update, struct rpki_uri *uri) -MOCK_ABORT_PTR(cache_recover, rpki_uri, struct rpki_cache *cache, - struct uri_list *uris, bool use_rrdp) - -MOCK_ABORT_INT(init_tmpdir, void) - -MOCK_VOID(db_table_destroy, struct db_table *table) -MOCK_ABORT_INT(db_table_join, struct db_table *dst, struct db_table *src) +MOCK_ABORT_INT(validation_prepare, struct validation **out, struct tal *tal, + struct validation_handler *validation_handler) +MOCK_ABORT_ENUM(validation_pubkey_state, pubkey_state, struct validation *state) +MOCK(validation_tal, struct tal *, NULL, struct validation *state) /* Tests */ diff --git a/test/thread_pool_test.c b/test/thread_pool_test.c index 674a7da1..12ce0222 100644 --- a/test/thread_pool_test.c +++ b/test/thread_pool_test.c @@ -67,7 +67,7 @@ Suite *thread_pool_suite(void) TCase *single, *multiple; single = tcase_create("single_work"); - tcase_add_test(multiple, tpool_single_work); + tcase_add_test(single, tpool_single_work); multiple = tcase_create("multiple_work"); tcase_add_test(multiple, tpool_multiple_work);