michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: mslab_api: fix style

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

14
tests/kernel/mem_slab/mslab_api/src/main.c
View file

@ -18,12 +18,12 @@ extern void test_mslab_used_get(void);
void test_main(void *p1, void *p2, void *p3) void test_main(void *p1, void *p2, void *p3)
{ {
ztest_test_suite(test_mslab_api, ztest_test_suite(test_mslab_api,
ztest_unit_test(test_mslab_kinit), ztest_unit_test(test_mslab_kinit),
ztest_unit_test(test_mslab_kdefine), ztest_unit_test(test_mslab_kdefine),
ztest_unit_test(test_mslab_kdefine_extern), ztest_unit_test(test_mslab_kdefine_extern),
ztest_unit_test(test_mslab_alloc_free_thread), ztest_unit_test(test_mslab_alloc_free_thread),
ztest_unit_test(test_mslab_alloc_align), ztest_unit_test(test_mslab_alloc_align),
ztest_unit_test(test_mslab_alloc_timeout), ztest_unit_test(test_mslab_alloc_timeout),
ztest_unit_test(test_mslab_used_get)); ztest_unit_test(test_mslab_used_get));
ztest_run_test_suite(test_mslab_api); ztest_run_test_suite(test_mslab_api);
} }

26
tests/kernel/mem_slab/mslab_api/src/test_mslab_api.c
View file

@ -42,12 +42,12 @@ void tmslab_alloc_free(void *data)
/** TESTPOINT: Allocate memory from a memory slab.*/ /** TESTPOINT: Allocate memory from a memory slab.*/
/** TESTPOINT: @retval 0 Memory allocated.*/ /** TESTPOINT: @retval 0 Memory allocated.*/
zassert_true(k_mem_slab_alloc(pslab, &block[i], K_NO_WAIT) == 0, zassert_true(k_mem_slab_alloc(pslab, &block[i], K_NO_WAIT) == 0,
NULL); NULL);
/** /**
* TESTPOINT: The block address area pointed at by @a mem is set * TESTPOINT: The block address area pointed at by @a mem is set
* to the starting address of the memory block. * to the starting address of the memory block.
*/ */
zassert_not_null(block[i], NULL); zassert_not_null(block[i], NULL);
} }
for (int i = 0; i < BLK_NUM; i++) { for (int i = 0; i < BLK_NUM; i++) {
/** TESTPOINT: Free memory allocated from a memory slab.*/ /** TESTPOINT: Free memory allocated from a memory slab.*/
@ -62,7 +62,7 @@ static void tmslab_alloc_align(void *data)
for (int i = 0; i < BLK_NUM; i++) { for (int i = 0; i < BLK_NUM; i++) {
zassert_true(k_mem_slab_alloc(pslab, &block[i], K_NO_WAIT) == 0, zassert_true(k_mem_slab_alloc(pslab, &block[i], K_NO_WAIT) == 0,
NULL); NULL);
/** /**
* TESTPOINT: To ensure that each memory block is similarly * TESTPOINT: To ensure that each memory block is similarly
* aligned to this boundary * aligned to this boundary
@ -82,17 +82,17 @@ static void tmslab_alloc_timeout(void *data)
for (int i = 0; i < BLK_NUM; i++) { for (int i = 0; i < BLK_NUM; i++) {
zassert_true(k_mem_slab_alloc(pslab, &block[i], K_NO_WAIT) == 0, zassert_true(k_mem_slab_alloc(pslab, &block[i], K_NO_WAIT) == 0,
NULL); NULL);
} }
/** TESTPOINT: Use K_NO_WAIT to return without waiting*/ /** TESTPOINT: Use K_NO_WAIT to return without waiting*/
/** TESTPOINT: @retval -ENOMEM Returned without waiting.*/ /** TESTPOINT: @retval -ENOMEM Returned without waiting.*/
zassert_equal(k_mem_slab_alloc(pslab, &block_fail, K_NO_WAIT), -ENOMEM, zassert_equal(k_mem_slab_alloc(pslab, &block_fail, K_NO_WAIT), -ENOMEM,
NULL); NULL);
/** TESTPOINT: @retval -EAGAIN Waiting period timed out*/ /** TESTPOINT: @retval -EAGAIN Waiting period timed out*/
tms = k_uptime_get(); tms = k_uptime_get();
zassert_equal(k_mem_slab_alloc(pslab, &block_fail, TIMEOUT), -EAGAIN, zassert_equal(k_mem_slab_alloc(pslab, &block_fail, TIMEOUT), -EAGAIN,
NULL); NULL);
/** /**
* TESTPOINT: @param timeout Maximum time to wait for operation to * TESTPOINT: @param timeout Maximum time to wait for operation to
* complete (in milliseconds) * complete (in milliseconds)
@ -111,31 +111,31 @@ static void tmslab_used_get(void *data)
for (int i = 0; i < BLK_NUM; i++) { for (int i = 0; i < BLK_NUM; i++) {
zassert_true(k_mem_slab_alloc(pslab, &block[i], K_NO_WAIT) == 0, zassert_true(k_mem_slab_alloc(pslab, &block[i], K_NO_WAIT) == 0,
NULL); NULL);
/** TESTPOINT: Get the number of used blocks in a memory slab.*/ /** TESTPOINT: Get the number of used blocks in a memory slab.*/
zassert_equal(k_mem_slab_num_used_get(pslab), i+1, NULL); zassert_equal(k_mem_slab_num_used_get(pslab), i + 1, NULL);
/** /**
* TESTPOINT: Get the number of unused blocks in a memory slab. * TESTPOINT: Get the number of unused blocks in a memory slab.
*/ */
zassert_equal(k_mem_slab_num_free_get(pslab), BLK_NUM-1-i, NULL); zassert_equal(k_mem_slab_num_free_get(pslab), BLK_NUM - 1 - i, NULL);
} }
zassert_equal(k_mem_slab_alloc(pslab, &block_fail, K_NO_WAIT), -ENOMEM, zassert_equal(k_mem_slab_alloc(pslab, &block_fail, K_NO_WAIT), -ENOMEM,
NULL); NULL);
/* free get on allocation failure*/ /* free get on allocation failure*/
zassert_equal(k_mem_slab_num_free_get(pslab), 0, NULL); zassert_equal(k_mem_slab_num_free_get(pslab), 0, NULL);
/* used get on allocation failure*/ /* used get on allocation failure*/
zassert_equal(k_mem_slab_num_used_get(pslab), BLK_NUM, NULL); zassert_equal(k_mem_slab_num_used_get(pslab), BLK_NUM, NULL);
zassert_equal(k_mem_slab_alloc(pslab, &block_fail, TIMEOUT), -EAGAIN, zassert_equal(k_mem_slab_alloc(pslab, &block_fail, TIMEOUT), -EAGAIN,
NULL); NULL);
zassert_equal(k_mem_slab_num_free_get(pslab), 0, NULL); zassert_equal(k_mem_slab_num_free_get(pslab), 0, NULL);
zassert_equal(k_mem_slab_num_used_get(pslab), BLK_NUM, NULL); zassert_equal(k_mem_slab_num_used_get(pslab), BLK_NUM, NULL);
for (int i = 0; i < BLK_NUM; i++) { for (int i = 0; i < BLK_NUM; i++) {
k_mem_slab_free(pslab, &block[i]); k_mem_slab_free(pslab, &block[i]);
zassert_equal(k_mem_slab_num_free_get(pslab), i+1, NULL); zassert_equal(k_mem_slab_num_free_get(pslab), i + 1, NULL);
zassert_equal(k_mem_slab_num_used_get(pslab), BLK_NUM-1-i, NULL); zassert_equal(k_mem_slab_num_used_get(pslab), BLK_NUM - 1 - i, NULL);
} }
} }