From 1a0875111c224dd25fe3378369528e6068d37563 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 16 Jun 2017 21:55:10 -0400 Subject: [PATCH] tests: alert_api: fix code style Signed-off-by: Anas Nashif --- tests/kernel/alert/alert_api/src/main.c | 20 ++++++++--------- .../alert/alert_api/src/test_alert_contexts.c | 22 ++++++++++++++----- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/tests/kernel/alert/alert_api/src/main.c b/tests/kernel/alert/alert_api/src/main.c index 830484d5777..b3e26ea5047 100644 --- a/tests/kernel/alert/alert_api/src/main.c +++ b/tests/kernel/alert/alert_api/src/main.c @@ -27,15 +27,15 @@ extern void test_isr_kinit_alert(void); void test_main(void *p1, void *p2, void *p3) { ztest_test_suite(test_alert_api, - ztest_unit_test(test_thread_alert_default), - ztest_unit_test(test_thread_alert_ignore), - ztest_unit_test(test_thread_alert_consumed), - ztest_unit_test(test_thread_alert_pending), - ztest_unit_test(test_isr_alert_default), - ztest_unit_test(test_isr_alert_ignore), - ztest_unit_test(test_isr_alert_consumed), - ztest_unit_test(test_isr_alert_pending), - ztest_unit_test(test_thread_kinit_alert), - ztest_unit_test(test_isr_kinit_alert)); + ztest_unit_test(test_thread_alert_default), + ztest_unit_test(test_thread_alert_ignore), + ztest_unit_test(test_thread_alert_consumed), + ztest_unit_test(test_thread_alert_pending), + ztest_unit_test(test_isr_alert_default), + ztest_unit_test(test_isr_alert_ignore), + ztest_unit_test(test_isr_alert_consumed), + ztest_unit_test(test_isr_alert_pending), + ztest_unit_test(test_thread_kinit_alert), + ztest_unit_test(test_isr_kinit_alert)); ztest_run_test_suite(test_alert_api); } diff --git a/tests/kernel/alert/alert_api/src/test_alert_contexts.c b/tests/kernel/alert/alert_api/src/test_alert_contexts.c index a331352de7f..8ef0918f75c 100644 --- a/tests/kernel/alert/alert_api/src/test_alert_contexts.c +++ b/tests/kernel/alert/alert_api/src/test_alert_contexts.c @@ -55,17 +55,19 @@ static void alert_recv(void) int ret; if (palert->handler == K_ALERT_IGNORE || - palert->handler == alert_handler0){ - if (palert->handler == alert_handler0) + palert->handler == alert_handler0) { + if (palert->handler == alert_handler0) { zassert_equal(handler_executed, PENDING_MAX, NULL); + } ret = k_alert_recv(palert, TIMEOUT); zassert_equal(ret, -EAGAIN, NULL); } if (palert->handler == K_ALERT_DEFAULT || - palert->handler == alert_handler1){ - if (palert->handler == alert_handler1) + palert->handler == alert_handler1) { + if (palert->handler == alert_handler1) { zassert_equal(handler_executed, PENDING_MAX, NULL); + } for (int i = 0; i < PENDING_MAX; i++) { /**TESTPOINT: alert recv*/ ret = k_alert_recv(palert, K_NO_WAIT); @@ -90,8 +92,8 @@ static void thread_alert(void) handler_executed = 0; /**TESTPOINT: thread-thread sync via alert*/ k_tid_t tid = k_thread_create(&tdata, tstack, STACK_SIZE, - tThread_entry, NULL, NULL, NULL, - K_PRIO_PREEMPT(0), 0, 0); + tThread_entry, NULL, NULL, NULL, + K_PRIO_PREEMPT(0), 0, 0); alert_send(); k_sleep(TIMEOUT); k_thread_abort(tid); @@ -115,6 +117,7 @@ static void isr_alert(void) void test_thread_alert_default(void) { struct k_alert alert; + /**TESTPOINT: init via k_alert_init*/ k_alert_init(&alert, K_ALERT_DEFAULT, PENDING_MAX); @@ -128,6 +131,7 @@ void test_thread_alert_ignore(void) { /**TESTPOINT: alert handler ignore*/ struct k_alert alert; + /**TESTPOINT: init via k_alert_init*/ k_alert_init(&alert, K_ALERT_IGNORE, PENDING_MAX); palert = &alert; @@ -137,6 +141,7 @@ void test_thread_alert_ignore(void) void test_thread_alert_consumed(void) { struct k_alert alert; + /**TESTPOINT: init via k_alert_init*/ k_alert_init(&alert, alert_handler0, PENDING_MAX); @@ -148,6 +153,7 @@ void test_thread_alert_consumed(void) void test_thread_alert_pending(void) { struct k_alert alert; + /**TESTPOINT: init via k_alert_init*/ k_alert_init(&alert, alert_handler1, PENDING_MAX); @@ -159,6 +165,7 @@ void test_thread_alert_pending(void) void test_isr_alert_default(void) { struct k_alert alert; + /**TESTPOINT: init via k_alert_init*/ k_alert_init(&alert, K_ALERT_DEFAULT, PENDING_MAX); @@ -171,6 +178,7 @@ void test_isr_alert_ignore(void) { /**TESTPOINT: alert handler ignore*/ struct k_alert alert; + /**TESTPOINT: init via k_alert_init*/ k_alert_init(&alert, K_ALERT_IGNORE, PENDING_MAX); palert = &alert; @@ -180,6 +188,7 @@ void test_isr_alert_ignore(void) void test_isr_alert_consumed(void) { struct k_alert alert; + /**TESTPOINT: init via k_alert_init*/ k_alert_init(&alert, alert_handler0, PENDING_MAX); @@ -191,6 +200,7 @@ void test_isr_alert_consumed(void) void test_isr_alert_pending(void) { struct k_alert alert; + /**TESTPOINT: init via k_alert_init*/ k_alert_init(&alert, alert_handler1, PENDING_MAX);