diff --git a/tests/lib/ringbuffer/prj.conf b/tests/lib/ringbuffer/prj.conf index bdf8fa4857..0679f9f312 100644 --- a/tests/lib/ringbuffer/prj.conf +++ b/tests/lib/ringbuffer/prj.conf @@ -1,4 +1,5 @@ CONFIG_ZTEST=y +CONFIG_ZTEST_NEW_API=y CONFIG_ZTRESS=y CONFIG_TEST_EXTRA_STACK_SIZE=1024 CONFIG_IRQ_OFFLOAD=y diff --git a/tests/lib/ringbuffer/src/concurrent.c b/tests/lib/ringbuffer/src/concurrent.c index 05c7b64a7a..726db42aac 100644 --- a/tests/lib/ringbuffer/src/concurrent.c +++ b/tests/lib/ringbuffer/src/concurrent.c @@ -90,7 +90,7 @@ static bool user_handler(void *user_data, uint32_t iter_cnt, bool last, int prio * * @ingroup lib_ringbuffer_tests */ -void test_ringbuffer_concurrent(void) +ZTEST(ringbuffer_api, test_ringbuffer_concurrent) { ztress_set_timeout(K_MSEC(1000)); ZTRESS_EXECUTE(ZTRESS_THREAD(user_handler, (void *)0, 0, 0, Z_TIMEOUT_TICKS(20)), @@ -296,7 +296,7 @@ void test_ringbuffer_stress(ztress_handler produce_handler, /* Zero-copy API. Test is validating single producer, single consumer from * different priorities. */ -void test_ringbuffer_zerocpy_stress(void) +ZTEST(ringbuffer_api, test_ringbuffer_zerocpy_stress) { test_ringbuffer_stress(produce, consume, false); } @@ -304,7 +304,7 @@ void test_ringbuffer_zerocpy_stress(void) /* Copy API. Test is validating single producer, single consumer from * different priorities. */ -void test_ringbuffer_cpy_stress(void) +ZTEST(ringbuffer_api, test_ringbuffer_cpy_stress) { test_ringbuffer_stress(produce_cpy, consume_cpy, false); } @@ -312,7 +312,7 @@ void test_ringbuffer_cpy_stress(void) /* Item API. Test is validating single producer, single consumer from * different priorities. */ -void test_ringbuffer_item_stress(void) +ZTEST(ringbuffer_api, test_ringbuffer_item_stress) { test_ringbuffer_stress(produce_item, consume_item, true); } diff --git a/tests/lib/ringbuffer/src/main.c b/tests/lib/ringbuffer/src/main.c index 1fd0911b70..afb1020143 100644 --- a/tests/lib/ringbuffer/src/main.c +++ b/tests/lib/ringbuffer/src/main.c @@ -91,7 +91,7 @@ extern void test_ringbuffer_item_stress(void); * * @see ring_buf_item_put, ring_buf_item_get */ -void test_ring_buffer_main(void) +ZTEST(ringbuffer_api, test_ring_buffer_main) { int ret, put_count, i; uint32_t getdata[6]; @@ -216,7 +216,7 @@ static void tringbuf_get_discard(const void *p) } /*test cases*/ -void test_ringbuffer_init(void) +ZTEST(ringbuffer_api, test_ringbuffer_init) { /**TESTPOINT: init via ring_buf_item_init*/ ring_buf_item_init(&ringbuf, RINGBUFFER_SIZE, buffer); @@ -224,13 +224,13 @@ void test_ringbuffer_init(void) zassert_equal(ring_buf_item_space_get(&ringbuf), RINGBUFFER_SIZE, NULL); } -void test_ringbuffer_declare_pow2(void) +ZTEST(ringbuffer_api, test_ringbuffer_declare_pow2) { zassert_true(ring_buf_is_empty(&ringbuf_pow2), NULL); zassert_equal(ring_buf_item_space_get(&ringbuf_pow2), (1 << POW), NULL); } -void test_ringbuffer_declare_size(void) +ZTEST(ringbuffer_api, test_ringbuffer_declare_size) { zassert_true(ring_buf_is_empty(&ringbuf_size), NULL); zassert_equal(ring_buf_item_space_get(&ringbuf_size), RINGBUFFER_SIZE, @@ -277,7 +277,7 @@ void test_ringbuffer_declare_size(void) * * @see ring_buf_item_put, ring_buf_item_get */ -void test_ringbuffer_put_get_thread(void) +ZTEST(ringbuffer_api, test_ringbuffer_put_get_thread) { pbuf = &ringbuf; for (int i = 0; i < 1000; i++) { @@ -292,7 +292,7 @@ void test_ringbuffer_put_get_thread(void) } } -void test_ringbuffer_put_get_isr(void) +ZTEST(ringbuffer_api, test_ringbuffer_put_get_isr) { pbuf = &ringbuf; irq_offload(tringbuf_put, (const void *)0); @@ -305,7 +305,7 @@ void test_ringbuffer_put_get_isr(void) zassert_true(ring_buf_is_empty(pbuf), NULL); } -void test_ringbuffer_put_get_thread_isr(void) +ZTEST(ringbuffer_api, test_ringbuffer_put_get_thread_isr) { pbuf = &ringbuf; tringbuf_put((const void *)0); @@ -316,7 +316,7 @@ void test_ringbuffer_put_get_thread_isr(void) irq_offload(tringbuf_get, (const void *)2); } -void test_ringbuffer_put_get_discard(void) +ZTEST(ringbuffer_api, test_ringbuffer_put_get_discard) { pbuf = &ringbuf; tringbuf_put((const void *)0); @@ -372,7 +372,7 @@ void test_ringbuffer_put_get_discard(void) * * @see ring_buf_item_put, ring_buf_item_get */ -void test_ringbuffer_pow2_put_get_thread_isr(void) +ZTEST(ringbuffer_api, test_ringbuffer_pow2_put_get_thread_isr) { pbuf = &ringbuf_pow2; tringbuf_put((const void *)0); @@ -428,7 +428,7 @@ void test_ringbuffer_pow2_put_get_thread_isr(void) * * @see ring_buf_item_put, ring_buf_item_get */ -void test_ringbuffer_size_put_get_thread_isr(void) +ZTEST(ringbuffer_api, test_ringbuffer_size_put_get_thread_isr) { pbuf = &ringbuf_size; tringbuf_put((const void *)0); @@ -479,7 +479,7 @@ void test_ringbuffer_size_put_get_thread_isr(void) * * @see ring_buf_put, ring_buf_get */ -void test_ringbuffer_raw(void) +ZTEST(ringbuffer_api, test_ringbuffer_raw) { int i; uint8_t inbuf[RINGBUFFER_SIZE]; @@ -539,7 +539,7 @@ void test_ringbuffer_raw(void) zassert_true(ring_buf_is_empty(&ringbuf_raw), NULL); } -void test_ringbuffer_alloc_put(void) +ZTEST(ringbuffer_api, test_ringbuffer_alloc_put) { uint8_t outputbuf[RINGBUFFER_SIZE]; uint8_t inputbuf[] = {1, 2, 3, 4}; @@ -604,7 +604,7 @@ void test_ringbuffer_alloc_put(void) } } -void test_byte_put_free(void) +ZTEST(ringbuffer_api, test_byte_put_free) { uint8_t indata[] = {1, 2, 3, 4, 5}; int err; @@ -651,7 +651,7 @@ void test_byte_put_free(void) } } -void test_capacity(void) +ZTEST(ringbuffer_api, test_capacity) { uint32_t capacity; @@ -662,7 +662,7 @@ void test_capacity(void) "Unexpected capacity"); } -void test_size(void) +ZTEST(ringbuffer_api, test_size) { uint32_t size; static uint8_t buf[RINGBUFFER_SIZE]; @@ -694,7 +694,7 @@ void test_size(void) size); } -void test_peek(void) +ZTEST(ringbuffer_api, test_peek) { uint32_t size; uint8_t byte = 0x42; @@ -737,7 +737,7 @@ void test_peek(void) "content validation failed"); } -void test_reset(void) +ZTEST(ringbuffer_api, test_reset) { uint8_t indata[] = {1, 2, 3, 4, 5}; uint8_t outdata[RINGBUFFER_SIZE]; @@ -814,7 +814,7 @@ static uint32_t ringbuf_stored[RINGBUFFER_SIZE]; * * @see ring_buf_item_put, ring_buf_item_get */ -void test_ringbuffer_array_perf(void) +ZTEST(ringbuffer_api, test_ringbuffer_array_perf) { struct ring_buf buf_ii; uint32_t input[3] = {0xaa, 0xbb, 0xcc}; @@ -844,7 +844,7 @@ void test_ringbuffer_array_perf(void) } } -void test_ringbuffer_partial_putting(void) +ZTEST(ringbuffer_api, test_ringbuffer_partial_putting) { uint8_t indata[RINGBUFFER_SIZE]; uint8_t outdata[RINGBUFFER_SIZE]; @@ -879,7 +879,7 @@ void test_ringbuffer_partial_putting(void) } } -void test_ringbuffer_partial_getting(void) +ZTEST(ringbuffer_api, test_ringbuffer_partial_getting) { uint8_t indata[RINGBUFFER_SIZE]; uint8_t outdata[RINGBUFFER_SIZE]; @@ -913,7 +913,7 @@ void test_ringbuffer_partial_getting(void) } } -void test_ringbuffer_equal_bufs(void) +ZTEST(ringbuffer_api, test_ringbuffer_equal_bufs) { struct ring_buf buf_ii; uint8_t *data; @@ -934,7 +934,7 @@ void test_ringbuffer_equal_bufs(void) } } -void test_ringbuffer_performance(void) +ZTEST(ringbuffer_api, test_ringbuffer_performance) { uint8_t buf[16]; static struct ring_buf rbuf; @@ -1000,35 +1000,4 @@ void test_ringbuffer_performance(void) } /*test case main entry*/ -void test_main(void) -{ - ztest_test_suite(test_ringbuffer_api, - ztest_unit_test(test_ringbuffer_init),/*keep init first!*/ - ztest_unit_test(test_ringbuffer_declare_pow2), - ztest_unit_test(test_ringbuffer_declare_size), - ztest_unit_test(test_ringbuffer_put_get_thread), - ztest_unit_test(test_ringbuffer_put_get_isr), - ztest_unit_test(test_ringbuffer_put_get_thread_isr), - ztest_unit_test(test_ringbuffer_put_get_discard), - ztest_unit_test(test_ringbuffer_pow2_put_get_thread_isr), - ztest_unit_test(test_ringbuffer_size_put_get_thread_isr), - ztest_unit_test(test_ringbuffer_array_perf), - ztest_unit_test(test_ringbuffer_partial_putting), - ztest_unit_test(test_ringbuffer_partial_getting), - ztest_unit_test(test_ring_buffer_main), - ztest_unit_test(test_ringbuffer_raw), - ztest_unit_test(test_ringbuffer_alloc_put), - ztest_unit_test(test_byte_put_free), - ztest_unit_test(test_ringbuffer_equal_bufs), - ztest_unit_test(test_capacity), - ztest_unit_test(test_size), - ztest_unit_test(test_peek), - ztest_unit_test(test_reset), - ztest_unit_test(test_ringbuffer_performance), - ztest_unit_test(test_ringbuffer_concurrent), - ztest_unit_test(test_ringbuffer_zerocpy_stress), - ztest_unit_test(test_ringbuffer_cpy_stress), - ztest_unit_test(test_ringbuffer_item_stress) - ); - ztest_run_test_suite(test_ringbuffer_api); -} +ZTEST_SUITE(ringbuffer_api, NULL, NULL, NULL, NULL, NULL);