diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/pkev.c | 22 | ||||
| -rw-r--r-- | test/pkev.cpp | 18 |
2 files changed, 20 insertions, 20 deletions
diff --git a/test/pkev.c b/test/pkev.c index 675de4b..c3bfeb9 100644 --- a/test/pkev.c +++ b/test/pkev.c @@ -24,13 +24,14 @@ handle_ev_two() ev_two.handled = true; } -struct pk_ev_mgr* +const pk_ev_mgr_id_T test_setup() { memset(&ev_one, 0, sizeof(struct ev)); memset(&ev_two, 0, sizeof(struct ev)); - struct pk_ev_mgr *evmgr = pk_ev_create(); - if (evmgr == NULL) { + pk_ev_init(); + const pk_ev_mgr_id_T evmgr = pk_ev_create_mgr(); + if (evmgr >= 64) { PK_LOGV_ERR("%s: failed to create pk_ev_mgr\n", __FILE__); exit(1); } @@ -42,21 +43,20 @@ int main(int argc, char *argv[]) (void)argc; (void)argv; (void)stdout; - pk_ev_id_T custom_ev_one = 1; - pk_ev_id_T custom_ev_two = 2; + pk_ev_id_T custom_ev_one; + pk_ev_id_T custom_ev_two; // register, emit, catch { - // TODO - struct pk_ev_mgr *evmgr = test_setup(); - pk_ev_register_ev(evmgr, custom_ev_one); - pk_ev_register_ev(evmgr, custom_ev_two); + const pk_ev_mgr_id_T evmgr = test_setup(); + custom_ev_one = pk_ev_register_ev(evmgr); + custom_ev_two = pk_ev_register_ev(evmgr); pk_ev_register_cb(evmgr, custom_ev_one, handle_ev_one); - pk_ev_register_cb(evmgr, custom_ev_one, handle_ev_two); + pk_ev_register_cb(evmgr, custom_ev_two, handle_ev_two); pk_ev_emit(evmgr, custom_ev_one); pk_ev_emit(evmgr, custom_ev_two); PK_LOGV_INF("%s: ev_one: %b, ev_two: %b\n", __FILE__, ev_one.handled, ev_two.handled); - free(evmgr); + pk_ev_teardown(); if (ev_one.handled == false || ev_two.handled == false) exit(1); } diff --git a/test/pkev.cpp b/test/pkev.cpp index 86c1706..6a12141 100644 --- a/test/pkev.cpp +++ b/test/pkev.cpp @@ -25,13 +25,14 @@ handle_ev_two() ev_two.handled = true; } -struct pk_ev_mgr* +const pk_ev_mgr_id_T test_setup() { memset(&ev_one, 0, sizeof(struct ev)); memset(&ev_two, 0, sizeof(struct ev)); - struct pk_ev_mgr *evmgr = pk_ev_create(); - if (evmgr == NULL) { + pk_ev_init(); + const pk_ev_mgr_id_T evmgr = pk_ev_create_mgr(); + if (evmgr >= 64) { PK_LOGV_ERR("%s: failed to create pk_ev_mgr\n", __FILE__); exit(1); } @@ -48,16 +49,15 @@ int main(int argc, char *argv[]) // register, emit, catch { - // TODO - struct pk_ev_mgr *evmgr = test_setup(); - pk_ev_register_ev(evmgr, custom_ev_one); - pk_ev_register_ev(evmgr, custom_ev_two); + pk_ev_mgr_id_T evmgr = test_setup(); + custom_ev_one = pk_ev_register_ev(evmgr); + custom_ev_two = pk_ev_register_ev(evmgr); pk_ev_register_cb(evmgr, custom_ev_one, handle_ev_one); - pk_ev_register_cb(evmgr, custom_ev_one, handle_ev_two); + pk_ev_register_cb(evmgr, custom_ev_two, handle_ev_two); pk_ev_emit(evmgr, custom_ev_one); pk_ev_emit(evmgr, custom_ev_two); PK_LOGV_INF("%s: ev_one: %b, ev_two: %b\n", __FILE__, ev_one.handled, ev_two.handled); - free(evmgr); + pk_ev_teardown(); if (ev_one.handled == false || ev_two.handled == false) exit(1); } |