tests: kernel: workq: migrate work_queue test cases

Move work_queue testcases to new ZTEST API.

Signed-off-by: NingX Zhao <ningx.zhao@intel.com>
This commit is contained in:
NingX Zhao 2022-08-23 09:19:32 +08:00 committed by Fabio Baltieri
parent d4e2e883d7
commit b2c64dee27
2 changed files with 25 additions and 33 deletions

View File

@ -1,4 +1,5 @@
CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_POLL=y
CONFIG_ASSERT=y

View File

@ -220,7 +220,7 @@ static void resubmit_work_handler(struct k_work *work)
*
* @see k_work_submit()
*/
static void test_resubmit(void)
ZTEST(workqueue_triggered, test_resubmit)
{
TC_PRINT("Starting resubmit test\n");
@ -327,7 +327,7 @@ static void coop_delayed_work_cancel_main(int arg1, int arg2)
* @see k_work_delayable_init(), k_work_schedule(),
* k_work_cancel_delayable()
*/
static void test_delayed_cancel(void)
ZTEST(workqueue_delayed, test_delayed_cancel)
{
TC_PRINT("Starting delayed cancel test\n");
@ -348,7 +348,7 @@ static void test_delayed_cancel(void)
reset_results();
}
static void test_delayed_pending(void)
ZTEST(workqueue_delayed, test_delayed_pending)
{
TC_PRINT("Starting delayed pending test\n");
@ -386,7 +386,7 @@ static void test_delayed_pending(void)
*
* @see k_work_init_delayable(), k_work_schedule()
*/
static void test_delayed(void)
ZTEST(workqueue_delayed, test_delayed)
{
TC_PRINT("Starting delayed test\n");
@ -483,7 +483,7 @@ static void test_triggered_trigger(void)
*
* @see k_work_poll_init(), k_work_poll_submit()
*/
static void test_triggered(void)
ZTEST(workqueue_triggered, test_triggered)
{
TC_PRINT("Starting triggered test\n");
@ -514,7 +514,7 @@ static void test_triggered(void)
*
* @see k_work_poll_init(), k_work_poll_submit()
*/
static void test_already_triggered(void)
ZTEST(workqueue_triggered, test_already_triggered)
{
TC_PRINT("Starting triggered test\n");
@ -563,7 +563,7 @@ static void triggered_resubmit_work_handler(struct k_work *work)
*
* @see k_work_poll_init(), k_work_poll_submit()
*/
static void test_triggered_resubmit(void)
ZTEST(workqueue_triggered, test_triggered_resubmit)
{
int i;
@ -607,7 +607,7 @@ static void test_triggered_resubmit(void)
*
* @see k_work_poll_init(), k_work_poll_submit()
*/
static void test_triggered_no_wait(void)
ZTEST(workqueue_triggered, test_triggered_no_wait)
{
TC_PRINT("Starting triggered test\n");
@ -638,7 +638,7 @@ static void test_triggered_no_wait(void)
*
* @see k_work_poll_init(), k_work_poll_submit()
*/
static void test_triggered_no_wait_expired(void)
ZTEST(workqueue_triggered, test_triggered_no_wait_expired)
{
TC_PRINT("Starting triggered test\n");
@ -666,7 +666,7 @@ static void test_triggered_no_wait_expired(void)
*
* @see k_work_poll_init(), k_work_poll_submit()
*/
static void test_triggered_wait(void)
ZTEST(workqueue_triggered, test_triggered_wait)
{
TC_PRINT("Starting triggered test\n");
@ -697,7 +697,7 @@ static void test_triggered_wait(void)
*
* @see k_work_poll_init(), k_work_poll_submit()
*/
static void test_triggered_wait_expired(void)
ZTEST(workqueue_triggered, test_triggered_wait_expired)
{
TC_PRINT("Starting triggered test\n");
@ -787,7 +787,7 @@ static void test_triggered_from_msgq_start(void)
* @see k_work_poll_init(), k_work_poll_submit()
*
*/
static void test_triggered_from_msgq(void)
ZTEST(workqueue_triggered, test_triggered_from_msgq)
{
TC_PRINT("Starting triggered from msgq test\n");
@ -807,7 +807,7 @@ static void test_triggered_from_msgq(void)
*
* @see K_WORK_DELAYABLE_DEFINE()
*/
void test_delayed_work_define(void)
ZTEST(workqueue_triggered, test_delayed_work_define)
{
struct k_work_delayable initialized_by_function = { 0 };
@ -829,7 +829,7 @@ void test_delayed_work_define(void)
*
* @see k_work_poll_cancel()
*/
static void test_triggered_cancel(void)
ZTEST(workqueue_triggered, test_triggered_cancel)
{
int ret;
@ -854,25 +854,16 @@ static void test_triggered_cancel(void)
}
/*test case main entry*/
void test_main(void)
static void *workq_setup(void)
{
k_thread_priority_set(k_current_get(), 0);
ztest_test_suite(workqueue,
ztest_1cpu_unit_test(test_sequence),
ztest_1cpu_unit_test(test_resubmit),
ztest_1cpu_unit_test(test_delayed),
ztest_1cpu_unit_test(test_delayed_cancel),
ztest_1cpu_unit_test(test_delayed_pending),
ztest_1cpu_unit_test(test_triggered),
ztest_1cpu_unit_test(test_already_triggered),
ztest_1cpu_unit_test(test_triggered_resubmit),
ztest_1cpu_unit_test(test_triggered_no_wait),
ztest_1cpu_unit_test(test_triggered_no_wait_expired),
ztest_1cpu_unit_test(test_triggered_wait),
ztest_1cpu_unit_test(test_triggered_wait_expired),
ztest_1cpu_unit_test(test_triggered_from_msgq),
ztest_1cpu_unit_test(test_delayed_work_define),
ztest_1cpu_unit_test(test_triggered_cancel)
);
ztest_run_test_suite(workqueue);
test_sequence();
return NULL;
}
ZTEST_SUITE(workqueue_delayed, NULL, workq_setup, ztest_simple_1cpu_before,
ztest_simple_1cpu_after, NULL);
ZTEST_SUITE(workqueue_triggered, NULL, workq_setup, ztest_simple_1cpu_before,
ztest_simple_1cpu_after, NULL);