From cd66ee67a77348af3329072da18a85cd696ec63f Mon Sep 17 00:00:00 2001 From: Meng xianglin Date: Thu, 4 Aug 2022 09:15:59 +0800 Subject: [PATCH] tests: msgq_api: move to new ztest API test cases in tests/kernel/msgq/msgq_api/ are move to new ztest API Signed-off-by: Meng xianglin --- tests/kernel/msgq/msgq_api/prj.conf | 1 + tests/kernel/msgq/msgq_api/src/main.c | 61 ++----------------- .../msgq/msgq_api/src/test_msgq_attrs.c | 4 +- .../msgq/msgq_api/src/test_msgq_contexts.c | 18 +++--- .../kernel/msgq/msgq_api/src/test_msgq_fail.c | 8 +-- .../msgq/msgq_api/src/test_msgq_purge.c | 4 +- 6 files changed, 23 insertions(+), 73 deletions(-) diff --git a/tests/kernel/msgq/msgq_api/prj.conf b/tests/kernel/msgq/msgq_api/prj.conf index 29f2d64944e..57b97c472ee 100644 --- a/tests/kernel/msgq/msgq_api/prj.conf +++ b/tests/kernel/msgq/msgq_api/prj.conf @@ -1,3 +1,4 @@ CONFIG_ZTEST=y +CONFIG_ZTEST_NEW_API=y CONFIG_IRQ_OFFLOAD=y CONFIG_TEST_USERSPACE=y diff --git a/tests/kernel/msgq/msgq_api/src/main.c b/tests/kernel/msgq/msgq_api/src/main.c index ee1625cc0af..273f236a322 100644 --- a/tests/kernel/msgq/msgq_api/src/main.c +++ b/tests/kernel/msgq/msgq_api/src/main.c @@ -15,39 +15,6 @@ #include "test_msgq.h" -extern void test_msgq_thread(void); -extern void test_msgq_thread_overflow(void); -extern void test_msgq_isr(void); -extern void test_msgq_put_fail(void); -extern void test_msgq_get_fail(void); -extern void test_msgq_purge_when_put(void); -extern void test_msgq_attrs_get(void); -extern void test_msgq_alloc(void); -extern void test_msgq_pend_thread(void); -extern void test_msgq_empty(void); -extern void test_msgq_full(void); -#ifdef CONFIG_USERSPACE -extern void test_msgq_user_thread(void); -extern void test_msgq_user_thread_overflow(void); -extern void test_msgq_user_put_fail(void); -extern void test_msgq_user_get_fail(void); -extern void test_msgq_user_attrs_get(void); -extern void test_msgq_user_purge_when_put(void); -#else -#define dummy_test(_name) \ - static void _name(void) \ - { \ - ztest_test_skip(); \ - } - -dummy_test(test_msgq_user_thread); -dummy_test(test_msgq_user_thread_overflow); -dummy_test(test_msgq_user_put_fail); -dummy_test(test_msgq_user_get_fail); -dummy_test(test_msgq_user_attrs_get); -dummy_test(test_msgq_user_purge_when_put); -#endif /* CONFIG_USERSPACE */ - #ifdef CONFIG_64BIT #define MAX_SZ 256 #else @@ -62,31 +29,13 @@ extern struct k_sem end_sema; extern struct k_thread tdata; K_THREAD_STACK_DECLARE(tstack, STACK_SIZE); -/*test case main entry*/ -void test_main(void) +void *msgq_api_setup(void) { k_thread_access_grant(k_current_get(), &kmsgq, &msgq, &end_sema, &tdata, &tstack); - k_thread_heap_assign(k_current_get(), &test_pool); - - ztest_test_suite(msgq_api, - ztest_1cpu_unit_test(test_msgq_thread), - ztest_unit_test(test_msgq_thread_overflow), - ztest_user_unit_test(test_msgq_user_thread), - ztest_user_unit_test(test_msgq_user_thread_overflow), - ztest_unit_test(test_msgq_isr), - ztest_1cpu_unit_test(test_msgq_put_fail), - ztest_1cpu_unit_test(test_msgq_get_fail), - ztest_user_unit_test(test_msgq_user_put_fail), - ztest_user_unit_test(test_msgq_user_get_fail), - ztest_unit_test(test_msgq_attrs_get), - ztest_user_unit_test(test_msgq_user_attrs_get), - ztest_1cpu_unit_test(test_msgq_purge_when_put), - ztest_user_unit_test(test_msgq_user_purge_when_put), - ztest_1cpu_unit_test(test_msgq_pend_thread), - ztest_1cpu_unit_test(test_msgq_empty), - ztest_1cpu_unit_test(test_msgq_full), - ztest_unit_test(test_msgq_alloc)); - ztest_run_test_suite(msgq_api); + return NULL; } +ZTEST_SUITE(msgq_api, NULL, msgq_api_setup, NULL, NULL, NULL); +ZTEST_SUITE(msgq_api_1cpu, NULL, msgq_api_setup, + ztest_simple_1cpu_before, ztest_simple_1cpu_after, NULL); diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_attrs.c b/tests/kernel/msgq/msgq_api/src/test_msgq_attrs.c index 7c85d1f1070..c9e87c4fcfe 100644 --- a/tests/kernel/msgq/msgq_api/src/test_msgq_attrs.c +++ b/tests/kernel/msgq/msgq_api/src/test_msgq_attrs.c @@ -46,7 +46,7 @@ static void attrs_get(struct k_msgq *q) * * @see k_msgq_get_attrs() */ -void test_msgq_attrs_get(void) +ZTEST(msgq_api, test_msgq_attrs_get) { k_msgq_init(&msgq, tbuffer, MSG_SIZE, MSGQ_LEN); attrs_get(&msgq); @@ -59,7 +59,7 @@ void test_msgq_attrs_get(void) * * @see k_msgq_get_attrs() */ -void test_msgq_user_attrs_get(void) +ZTEST_USER(msgq_api, test_msgq_user_attrs_get) { struct k_msgq *q; diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c b/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c index dc07d88f6a2..f1dc48fb32a 100644 --- a/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c +++ b/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c @@ -250,7 +250,7 @@ static void put_full_entry(void *p1, void *p2, void *p3) * @brief Test thread to thread data passing via message queue * @see k_msgq_init(), k_msgq_get(), k_msgq_put(), k_msgq_purge() */ -void test_msgq_thread(void) +ZTEST(msgq_api_1cpu, test_msgq_thread) { int ret; @@ -267,7 +267,7 @@ void test_msgq_thread(void) * @brief Test thread to thread data passing via message queue * @see k_msgq_init(), k_msgq_get(), k_msgq_put(), k_msgq_purge() */ -void test_msgq_thread_overflow(void) +ZTEST(msgq_api, test_msgq_thread_overflow) { int ret; @@ -292,7 +292,7 @@ void test_msgq_thread_overflow(void) * @brief Test user thread to kernel thread data passing via message queue * @see k_msgq_alloc_init(), k_msgq_get(), k_msgq_put(), k_msgq_purge() */ -void test_msgq_user_thread(void) +ZTEST_USER(msgq_api, test_msgq_user_thread) { struct k_msgq *q; int ret; @@ -310,7 +310,7 @@ void test_msgq_user_thread(void) * @brief Test thread to thread data passing via message queue * @see k_msgq_alloc_init(), k_msgq_get(), k_msgq_put(), k_msgq_purge() */ -void test_msgq_user_thread_overflow(void) +ZTEST_USER(msgq_api, test_msgq_user_thread_overflow) { struct k_msgq *q; int ret; @@ -329,7 +329,7 @@ void test_msgq_user_thread_overflow(void) * @brief Test thread to isr data passing via message queue * @see k_msgq_init(), k_msgq_get(), k_msgq_put(), k_msgq_purge() */ -void test_msgq_isr(void) +ZTEST(msgq_api, test_msgq_isr) { static struct k_msgq stack_msgq; @@ -344,7 +344,7 @@ void test_msgq_isr(void) * @brief Test pending writer in msgq * @see k_msgq_init(), k_msgq_get(), k_msgq_put(), k_msgq_purge() */ -void test_msgq_pend_thread(void) +ZTEST(msgq_api_1cpu, test_msgq_pend_thread) { int ret; @@ -361,7 +361,7 @@ void test_msgq_pend_thread(void) * pool with various parameters * @see k_msgq_alloc_init(), k_msgq_cleanup() */ -void test_msgq_alloc(void) +ZTEST(msgq_api, test_msgq_alloc) { int ret; @@ -390,7 +390,7 @@ void test_msgq_alloc(void) * * @see k_msgq_get() */ -void test_msgq_empty(void) +ZTEST(msgq_api_1cpu, test_msgq_empty) { int pri = k_thread_priority_get(k_current_get()) - 1; int ret; @@ -430,7 +430,7 @@ void test_msgq_empty(void) * * @see k_msgq_put() */ -void test_msgq_full(void) +ZTEST(msgq_api_1cpu, test_msgq_full) { int pri = k_thread_priority_get(k_current_get()) - 1; int ret; diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c b/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c index 50b050217da..a2bd0b8618e 100644 --- a/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c +++ b/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c @@ -48,7 +48,7 @@ static void get_fail(struct k_msgq *q) * @brief Test returned error code during writing in msgq * @see k_msgq_init() */ -void test_msgq_put_fail(void) +ZTEST(msgq_api_1cpu, test_msgq_put_fail) { k_msgq_init(&msgq, tbuffer, MSG_SIZE, MSGQ_LEN); put_fail(&msgq); @@ -59,7 +59,7 @@ void test_msgq_put_fail(void) * @brief Test returned error code during writing in msgq * @see k_msgq_alloc_init() */ -void test_msgq_user_put_fail(void) +ZTEST_USER(msgq_api, test_msgq_user_put_fail) { struct k_msgq *q; @@ -74,7 +74,7 @@ void test_msgq_user_put_fail(void) * @brief Test returned error code during reading from msgq * @see k_msgq_init(), k_msgq_put() */ -void test_msgq_get_fail(void) +ZTEST(msgq_api_1cpu, test_msgq_get_fail) { k_msgq_init(&msgq, tbuffer, MSG_SIZE, MSGQ_LEN); get_fail(&msgq); @@ -85,7 +85,7 @@ void test_msgq_get_fail(void) * @brief Test returned error code during reading from msgq * @see k_msgq_alloc_init(), k_msgq_get() */ -void test_msgq_user_get_fail(void) +ZTEST_USER(msgq_api, test_msgq_user_get_fail) { struct k_msgq *q; diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c b/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c index ecd757e855d..22273489696 100644 --- a/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c +++ b/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c @@ -55,7 +55,7 @@ static void purge_when_put(struct k_msgq *q) * @brief Test purge a message queue * @see k_msgq_init(), k_msgq_purge(), k_msgq_put() */ -void test_msgq_purge_when_put(void) +ZTEST(msgq_api_1cpu, test_msgq_purge_when_put) { k_msgq_init(&msgq, tbuffer, MSG_SIZE, MSGQ_LEN); @@ -67,7 +67,7 @@ void test_msgq_purge_when_put(void) * @brief Test purge a message queue * @see k_msgq_init(), k_msgq_purge(), k_msgq_put() */ -void test_msgq_user_purge_when_put(void) +ZTEST_USER(msgq_api, test_msgq_user_purge_when_put) { struct k_msgq *q;