michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: timer_api: fix style

Browse source 
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-06-16 22:13:19 -04:00 • committed by Kumar Gala
commit 1a1ae2f929
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/kernel/timer/timer_api/src/main.c
View file

@ -23,13 +23,13 @@ void test_main(void *p1, void *p2, void *p3)
ARG_UNUSED(p3); ARG_UNUSED(p3);
ztest_test_suite(test_timer_api, ztest_test_suite(test_timer_api,
ztest_unit_test(test_timer_duration_period), ztest_unit_test(test_timer_duration_period),
ztest_unit_test(test_timer_period_0), ztest_unit_test(test_timer_period_0),
ztest_unit_test(test_timer_expirefn_null), ztest_unit_test(test_timer_expirefn_null),
ztest_unit_test(test_timer_status_get), ztest_unit_test(test_timer_status_get),
ztest_unit_test(test_timer_status_get_anytime), ztest_unit_test(test_timer_status_get_anytime),
ztest_unit_test(test_timer_status_sync), ztest_unit_test(test_timer_status_sync),
ztest_unit_test(test_timer_k_define), ztest_unit_test(test_timer_k_define),
ztest_unit_test(test_timer_user_data)); ztest_unit_test(test_timer_user_data));
ztest_run_test_suite(test_timer_api); ztest_run_test_suite(test_timer_api);
} }

28
tests/kernel/timer/timer_api/src/test_timer_api.c
View file

@ -18,12 +18,12 @@ K_TIMER_DEFINE(ktimer, duration_expire, duration_stop);
static struct k_timer timer; static struct k_timer timer;
static struct timer_data tdata; static struct timer_data tdata;
#define TIMER_ASSERT(exp, tmr) \ #define TIMER_ASSERT(exp, tmr) \
do { \ do { \
if (!(exp)) { \ if (!(exp)) { \
k_timer_stop(tmr); \ k_timer_stop(tmr); \
zassert_true(exp, NULL); \ zassert_true(exp, NULL); \
} \ } \
} while (0) } while (0)
static void init_timer_data(void) static void init_timer_data(void)
@ -39,7 +39,7 @@ static void duration_expire(struct k_timer *timer)
tdata.expire_cnt++; tdata.expire_cnt++;
if (tdata.expire_cnt == 1) { if (tdata.expire_cnt == 1) {
TIMER_ASSERT(k_uptime_delta(&tdata.timestamp) >= DURATION, TIMER_ASSERT(k_uptime_delta(&tdata.timestamp) >= DURATION,
timer); timer);
} else { } else {
TIMER_ASSERT(k_uptime_delta(&tdata.timestamp) >= PERIOD, timer); TIMER_ASSERT(k_uptime_delta(&tdata.timestamp) >= PERIOD, timer);
} }
@ -103,7 +103,7 @@ void test_timer_duration_period(void)
k_timer_init(&timer, duration_expire, duration_stop); k_timer_init(&timer, duration_expire, duration_stop);
k_timer_start(&timer, DURATION, PERIOD); k_timer_start(&timer, DURATION, PERIOD);
tdata.timestamp = k_uptime_get(); tdata.timestamp = k_uptime_get();
busy_wait_ms(DURATION + PERIOD * EXPIRE_TIMES + PERIOD/2); busy_wait_ms(DURATION + PERIOD * EXPIRE_TIMES + PERIOD / 2);
/** TESTPOINT: check expire and stop times */ /** TESTPOINT: check expire and stop times */
TIMER_ASSERT(tdata.expire_cnt == EXPIRE_TIMES, &timer); TIMER_ASSERT(tdata.expire_cnt == EXPIRE_TIMES, &timer);
TIMER_ASSERT(tdata.stop_cnt == 1, &timer); TIMER_ASSERT(tdata.stop_cnt == 1, &timer);
@ -135,7 +135,7 @@ void test_timer_expirefn_null(void)
/** TESTPOINT: expire function NULL */ /** TESTPOINT: expire function NULL */
k_timer_init(&timer, NULL, duration_stop); k_timer_init(&timer, NULL, duration_stop);
k_timer_start(&timer, DURATION, PERIOD); k_timer_start(&timer, DURATION, PERIOD);
busy_wait_ms(DURATION + PERIOD * EXPIRE_TIMES + PERIOD/2); busy_wait_ms(DURATION + PERIOD * EXPIRE_TIMES + PERIOD / 2);
k_timer_stop(&timer); k_timer_stop(&timer);
/** TESTPOINT: expire handler is not invoked */ /** TESTPOINT: expire handler is not invoked */
@ -155,7 +155,7 @@ void test_timer_status_get(void)
/** TESTPOINT: status get upon timer starts */ /** TESTPOINT: status get upon timer starts */
TIMER_ASSERT(k_timer_status_get(&timer) == 0, &timer); TIMER_ASSERT(k_timer_status_get(&timer) == 0, &timer);
/** TESTPOINT: remaining get upon timer starts */ /** TESTPOINT: remaining get upon timer starts */
TIMER_ASSERT(k_timer_remaining_get(&timer) >= DURATION/2, &timer); TIMER_ASSERT(k_timer_remaining_get(&timer) >= DURATION / 2, &timer);
/* cleanup environment */ /* cleanup environment */
k_timer_stop(&timer); k_timer_stop(&timer);
@ -166,7 +166,7 @@ void test_timer_status_get_anytime(void)
init_timer_data(); init_timer_data();
k_timer_init(&timer, NULL, NULL); k_timer_init(&timer, NULL, NULL);
k_timer_start(&timer, DURATION, PERIOD); k_timer_start(&timer, DURATION, PERIOD);
busy_wait_ms(DURATION + PERIOD * (EXPIRE_TIMES - 1) + PERIOD/2); busy_wait_ms(DURATION + PERIOD * (EXPIRE_TIMES - 1) + PERIOD / 2);
/** TESTPOINT: status get at any time */ /** TESTPOINT: status get at any time */
TIMER_ASSERT(k_timer_status_get(&timer) == EXPIRE_TIMES, &timer); TIMER_ASSERT(k_timer_status_get(&timer) == EXPIRE_TIMES, &timer);
@ -200,7 +200,7 @@ void test_timer_k_define(void)
/** TESTPOINT: init timer via k_timer_init */ /** TESTPOINT: init timer via k_timer_init */
k_timer_start(&ktimer, DURATION, PERIOD); k_timer_start(&ktimer, DURATION, PERIOD);
tdata.timestamp = k_uptime_get(); tdata.timestamp = k_uptime_get();
busy_wait_ms(DURATION + PERIOD * EXPIRE_TIMES + PERIOD/2); busy_wait_ms(DURATION + PERIOD * EXPIRE_TIMES + PERIOD / 2);
/** TESTPOINT: check expire and stop times */ /** TESTPOINT: check expire and stop times */
TIMER_ASSERT(tdata.expire_cnt == EXPIRE_TIMES, &ktimer); TIMER_ASSERT(tdata.expire_cnt == EXPIRE_TIMES, &ktimer);
@ -222,9 +222,9 @@ static struct k_timer user_data_timer[5] = {
K_TIMER_INITIALIZER(user_data_timer[4], user_data_timer_handler, NULL), K_TIMER_INITIALIZER(user_data_timer[4], user_data_timer_handler, NULL),
}; };
static const intptr_t user_data[5] = {0x1337, 0xbabe, 0xd00d, 0xdeaf, 0xfade}; static const intptr_t user_data[5] = { 0x1337, 0xbabe, 0xd00d, 0xdeaf, 0xfade };
static int user_data_correct[5] = {0, 0, 0, 0, 0}; static int user_data_correct[5] = { 0, 0, 0, 0, 0 };
static void user_data_timer_handler(struct k_timer *timer) static void user_data_timer_handler(struct k_timer *timer)
{ {