Skip to content

Commit d45788f

Browse files
nashifcarlescufi
nashif
authored and
carlescufi
committed
tests: i2s_api: convert to new ztest API
Move test to new ztest API. Signed-off-by: Anas Nashif <[email protected]>
1 parent 8ef2cd2 commit d45788f

File tree

7 files changed

+33
-135
lines changed

7 files changed

+33
-135
lines changed

‎tests/drivers/i2s/i2s_api/prj.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
CONFIG_I2S=y
22
CONFIG_ZTEST=y
33
CONFIG_TEST_USERSPACE=y
4+
CONFIG_ZTEST_NEW_API=y

‎tests/drivers/i2s/i2s_api/src/i2s_api_test.h‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,6 @@
1111
#include <zephyr/kernel.h>
1212
#include <zephyr/drivers/i2s.h>
1313

14-
void test_i2s_tx_transfer_configure_0(void);
15-
void test_i2s_rx_transfer_configure_0(void);
16-
void test_i2s_transfer_short(void);
17-
void test_i2s_transfer_long(void);
18-
void test_i2s_rx_sync_start(void);
19-
void test_i2s_rx_empty_timeout(void);
20-
void test_i2s_transfer_restart(void);
21-
void test_i2s_transfer_rx_overrun(void);
22-
void test_i2s_transfer_tx_underrun(void);
23-
24-
void test_i2s_tx_transfer_configure_1(void);
25-
void test_i2s_rx_transfer_configure_1(void);
26-
void test_i2s_state_not_ready_neg(void);
27-
void test_i2s_state_ready_neg(void);
28-
void test_i2s_state_running_neg(void);
29-
void test_i2s_state_stopping_neg(void);
30-
void test_i2s_state_error_neg(void);
31-
32-
void test_i2s_dir_both_transfer_configure_0(void);
33-
void test_i2s_dir_both_transfer_short(void);
34-
void test_i2s_dir_both_transfer_long(void);
35-
void test_i2s_dir_both_rx_empty_timeout(void);
36-
void test_i2s_dir_both_transfer_restart(void);
37-
void test_i2s_dir_both_transfer_rx_overrun(void);
38-
void test_i2s_dir_both_transfer_tx_underrun(void);
39-
40-
void test_i2s_dir_both_transfer_configure_1(void);
41-
void test_i2s_dir_both_state_running_neg(void);
42-
void test_i2s_dir_both_state_stopping_neg(void);
43-
void test_i2s_dir_both_state_error_neg(void);
44-
4514
extern struct k_mem_slab rx_mem_slab;
4615
extern struct k_mem_slab tx_mem_slab;
4716

‎tests/drivers/i2s/i2s_api/src/main.c‎

Lines changed: 6 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <zephyr/device.h>
1111
#include "i2s_api_test.h"
1212

13-
void test_main(void)
13+
static void *setup(void)
1414
{
1515
const struct device *dev_i2s_rx;
1616
const struct device *dev_i2s_tx;
@@ -27,81 +27,9 @@ void test_main(void)
2727
if (dev_i2s_tx != NULL) {
2828
k_object_access_grant(dev_i2s_tx, k_current_get());
2929
}
30-
31-
ztest_test_suite(i2s_loopback_test,
32-
ztest_unit_test(test_i2s_tx_transfer_configure_0),
33-
ztest_unit_test(test_i2s_rx_transfer_configure_0),
34-
ztest_unit_test(test_i2s_transfer_short),
35-
ztest_unit_test(test_i2s_transfer_long),
36-
ztest_unit_test(test_i2s_rx_sync_start),
37-
ztest_unit_test(test_i2s_rx_empty_timeout),
38-
ztest_unit_test(test_i2s_transfer_restart),
39-
ztest_unit_test(test_i2s_transfer_rx_overrun),
40-
ztest_unit_test(test_i2s_transfer_tx_underrun));
41-
ztest_run_test_suite(i2s_loopback_test);
42-
43-
ztest_test_suite(i2s_states_test,
44-
ztest_unit_test(test_i2s_tx_transfer_configure_1),
45-
ztest_unit_test(test_i2s_rx_transfer_configure_1),
46-
ztest_unit_test(test_i2s_state_not_ready_neg),
47-
ztest_unit_test(test_i2s_state_ready_neg),
48-
ztest_unit_test(test_i2s_state_running_neg),
49-
ztest_unit_test(test_i2s_state_stopping_neg),
50-
ztest_unit_test(test_i2s_state_error_neg));
51-
ztest_run_test_suite(i2s_states_test);
52-
53-
ztest_test_suite(i2s_dir_both_loopback_test,
54-
ztest_unit_test(test_i2s_dir_both_transfer_configure_0),
55-
ztest_unit_test(test_i2s_dir_both_transfer_short),
56-
ztest_unit_test(test_i2s_dir_both_transfer_long),
57-
ztest_unit_test(test_i2s_dir_both_transfer_restart),
58-
ztest_unit_test(test_i2s_dir_both_transfer_rx_overrun),
59-
ztest_unit_test(test_i2s_dir_both_transfer_tx_underrun));
60-
ztest_run_test_suite(i2s_dir_both_loopback_test);
61-
62-
ztest_test_suite(i2s_dir_both_states_test,
63-
ztest_unit_test(test_i2s_dir_both_transfer_configure_1),
64-
ztest_unit_test(test_i2s_dir_both_state_running_neg),
65-
ztest_unit_test(test_i2s_dir_both_state_stopping_neg),
66-
ztest_unit_test(test_i2s_dir_both_state_error_neg));
67-
ztest_run_test_suite(i2s_dir_both_states_test);
68-
69-
/* Now run all tests in user mode */
70-
ztest_test_suite(i2s_user_loopback_test,
71-
ztest_user_unit_test(test_i2s_tx_transfer_configure_0),
72-
ztest_user_unit_test(test_i2s_rx_transfer_configure_0),
73-
ztest_user_unit_test(test_i2s_transfer_short),
74-
ztest_user_unit_test(test_i2s_transfer_long),
75-
ztest_user_unit_test(test_i2s_rx_sync_start),
76-
ztest_user_unit_test(test_i2s_rx_empty_timeout),
77-
ztest_user_unit_test(test_i2s_transfer_restart),
78-
ztest_user_unit_test(test_i2s_transfer_tx_underrun),
79-
ztest_user_unit_test(test_i2s_transfer_rx_overrun));
80-
ztest_run_test_suite(i2s_user_loopback_test);
81-
82-
ztest_test_suite(i2s_user_states_test,
83-
ztest_user_unit_test(test_i2s_tx_transfer_configure_1),
84-
ztest_user_unit_test(test_i2s_rx_transfer_configure_1),
85-
ztest_user_unit_test(test_i2s_state_not_ready_neg),
86-
ztest_user_unit_test(test_i2s_state_ready_neg),
87-
ztest_user_unit_test(test_i2s_state_running_neg),
88-
ztest_user_unit_test(test_i2s_state_stopping_neg),
89-
ztest_user_unit_test(test_i2s_state_error_neg));
90-
ztest_run_test_suite(i2s_user_states_test);
91-
92-
ztest_test_suite(i2s_dir_both_user_loopback_test,
93-
ztest_user_unit_test(test_i2s_dir_both_transfer_configure_0),
94-
ztest_user_unit_test(test_i2s_dir_both_transfer_short),
95-
ztest_user_unit_test(test_i2s_dir_both_transfer_long),
96-
ztest_user_unit_test(test_i2s_dir_both_transfer_restart),
97-
ztest_user_unit_test(test_i2s_dir_both_transfer_rx_overrun),
98-
ztest_user_unit_test(test_i2s_dir_both_transfer_tx_underrun));
99-
ztest_run_test_suite(i2s_dir_both_user_loopback_test);
100-
101-
ztest_test_suite(i2s_dir_both_user_states_test,
102-
ztest_user_unit_test(test_i2s_dir_both_transfer_configure_1),
103-
ztest_user_unit_test(test_i2s_dir_both_state_running_neg),
104-
ztest_user_unit_test(test_i2s_dir_both_state_stopping_neg),
105-
ztest_user_unit_test(test_i2s_dir_both_state_error_neg));
106-
ztest_run_test_suite(i2s_dir_both_user_states_test);
30+
return NULL;
10731
}
32+
ZTEST_SUITE(i2s_loopback, NULL, setup, NULL, NULL, NULL);
33+
ZTEST_SUITE(i2s_states, NULL, setup, NULL, NULL, NULL);
34+
ZTEST_SUITE(i2s_dir_both_states, NULL, setup, NULL, NULL, NULL);
35+
ZTEST_SUITE(i2s_dir_both_loopback, NULL, setup, NULL, NULL, NULL);

‎tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_loopback.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
static ZTEST_DMEM const struct device *dev_i2s;
1919
static ZTEST_DMEM bool dir_both_supported;
2020

21-
void test_i2s_dir_both_transfer_configure_0(void)
21+
ZTEST_USER(i2s_dir_both_loopback, test_i2s_dir_both_transfer_configure_0)
2222
{
2323
int ret;
2424

@@ -47,7 +47,7 @@ void test_i2s_dir_both_transfer_configure_0(void)
4747
* - Sending / receiving a short sequence of data returns success.
4848
* - DRAIN trigger empties the transmit queue and stops both streams.
4949
*/
50-
void test_i2s_dir_both_transfer_short(void)
50+
ZTEST_USER(i2s_dir_both_loopback, test_i2s_dir_both_transfer_short)
5151
{
5252
if (!dir_both_supported) {
5353
TC_PRINT("I2S_DIR_BOTH value is not supported.\n");
@@ -102,7 +102,7 @@ void test_i2s_dir_both_transfer_short(void)
102102
* - Sending / receiving a long sequence of data returns success.
103103
* - DRAIN trigger empties the transmit queue and stops both streams.
104104
*/
105-
void test_i2s_dir_both_transfer_long(void)
105+
ZTEST_USER(i2s_dir_both_loopback, test_i2s_dir_both_transfer_long)
106106
{
107107
if (!dir_both_supported) {
108108
TC_PRINT("I2S_DIR_BOTH value is not supported.\n");
@@ -147,7 +147,7 @@ void test_i2s_dir_both_transfer_long(void)
147147
* consecutive START trigger restarts transfer / reception with the next data
148148
* block.
149149
*/
150-
void test_i2s_dir_both_transfer_restart(void)
150+
ZTEST_USER(i2s_dir_both_loopback, test_i2s_dir_both_transfer_restart)
151151
{
152152
if (!dir_both_supported) {
153153
TC_PRINT("I2S_DIR_BOTH value is not supported.\n");
@@ -212,7 +212,7 @@ void test_i2s_dir_both_transfer_restart(void)
212212
* - Sending PREPARE trigger after the RX buffer overrun occurred changes
213213
* the interface state to READY.
214214
*/
215-
void test_i2s_dir_both_transfer_rx_overrun(void)
215+
ZTEST_USER(i2s_dir_both_loopback, test_i2s_dir_both_transfer_rx_overrun)
216216
{
217217
if (!dir_both_supported) {
218218
TC_PRINT("I2S_DIR_BOTH value is not supported.\n");
@@ -281,7 +281,7 @@ void test_i2s_dir_both_transfer_rx_overrun(void)
281281
* - Sending PREPARE trigger after the TX buffer underrun occurred changes
282282
* the interface state to READY.
283283
*/
284-
void test_i2s_dir_both_transfer_tx_underrun(void)
284+
ZTEST_USER(i2s_dir_both_loopback, test_i2s_dir_both_transfer_tx_underrun)
285285
{
286286
if (!dir_both_supported) {
287287
TC_PRINT("I2S_DIR_BOTH value is not supported.\n");

‎tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_states.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
static ZTEST_DMEM const struct device *dev_i2s;
1919
static ZTEST_DMEM bool dir_both_supported;
2020

21-
void test_i2s_dir_both_transfer_configure_1(void)
21+
ZTEST_USER(i2s_dir_both_states, test_i2s_dir_both_transfer_configure_1)
2222
{
2323
int ret;
2424

@@ -47,7 +47,7 @@ void test_i2s_dir_both_transfer_configure_1(void)
4747
*
4848
* - Sending START, PREPARE trigger in RUNNING state returns failure.
4949
*/
50-
void test_i2s_dir_both_state_running_neg(void)
50+
ZTEST_USER(i2s_dir_both_states, test_i2s_dir_both_state_running_neg)
5151
{
5252
if (!dir_both_supported) {
5353
TC_PRINT("I2S_DIR_BOTH value is not supported.\n");
@@ -91,7 +91,7 @@ void test_i2s_dir_both_state_running_neg(void)
9191
* - Sending START, STOP, DRAIN, PREPARE trigger in STOPPING state returns
9292
* failure.
9393
*/
94-
void test_i2s_dir_both_state_stopping_neg(void)
94+
ZTEST_USER(i2s_dir_both_states, test_i2s_dir_both_state_stopping_neg)
9595
{
9696
if (!dir_both_supported) {
9797
TC_PRINT("I2S_DIR_BOTH value is not supported.\n");
@@ -144,7 +144,7 @@ void test_i2s_dir_both_state_stopping_neg(void)
144144
*
145145
* - Sending START, STOP, DRAIN trigger in ERROR state returns failure.
146146
*/
147-
void test_i2s_dir_both_state_error_neg(void)
147+
ZTEST_USER(i2s_dir_both_states, test_i2s_dir_both_state_error_neg)
148148
{
149149
if (!dir_both_supported) {
150150
TC_PRINT("I2S_DIR_BOTH value is not supported.\n");

‎tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ static ZTEST_DMEM const struct device *dev_i2s_rx;
1414
static ZTEST_DMEM const struct device *dev_i2s_tx;
1515

1616
/** Configure I2S TX transfer. */
17-
void test_i2s_tx_transfer_configure_0(void)
17+
ZTEST_USER(i2s_loopback, test_i2s_tx_transfer_configure_0)
1818
{
1919
int ret;
2020

@@ -26,7 +26,7 @@ void test_i2s_tx_transfer_configure_0(void)
2626
}
2727

2828
/** Configure I2S RX transfer. */
29-
void test_i2s_rx_transfer_configure_0(void)
29+
ZTEST_USER(i2s_loopback, test_i2s_rx_transfer_configure_0)
3030
{
3131
int ret;
3232

@@ -45,7 +45,7 @@ void test_i2s_rx_transfer_configure_0(void)
4545
* - TX stream DRAIN trigger empties the transmit queue.
4646
* - RX stream STOP trigger stops reception.
4747
*/
48-
void test_i2s_transfer_short(void)
48+
ZTEST_USER(i2s_loopback, test_i2s_transfer_short)
4949
{
5050
if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
5151
TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -111,7 +111,7 @@ void test_i2s_transfer_short(void)
111111
* - TX stream DRAIN trigger empties the transmit queue.
112112
* - RX stream STOP trigger stops reception.
113113
*/
114-
void test_i2s_transfer_long(void)
114+
ZTEST_USER(i2s_loopback, test_i2s_transfer_long)
115115
{
116116
if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
117117
TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -165,7 +165,7 @@ void test_i2s_transfer_long(void)
165165
* - TX stream DROP trigger stops transmission and clears the transmit queue.
166166
* - RX stream DROP trigger stops reception and clears the receive queue.
167167
*/
168-
void test_i2s_rx_sync_start(void)
168+
ZTEST_USER(i2s_loopback, test_i2s_rx_sync_start)
169169
{
170170
if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
171171
TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -217,7 +217,7 @@ void test_i2s_rx_sync_start(void)
217217
*
218218
* - Reading empty RX queue in READY state returns time out error.
219219
*/
220-
void test_i2s_rx_empty_timeout(void)
220+
ZTEST_USER(i2s_loopback, test_i2s_rx_empty_timeout)
221221
{
222222
size_t rx_size;
223223
int ret;
@@ -233,7 +233,7 @@ void test_i2s_rx_empty_timeout(void)
233233
* consecutive START trigger restarts transfer / reception with the next data
234234
* block.
235235
*/
236-
void test_i2s_transfer_restart(void)
236+
ZTEST_USER(i2s_loopback, test_i2s_transfer_restart)
237237
{
238238
if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
239239
TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -318,7 +318,7 @@ void test_i2s_transfer_restart(void)
318318
* - Sending PREPARE trigger after the RX buffer overrun occurred changes
319319
* the interface state to READY.
320320
*/
321-
void test_i2s_transfer_rx_overrun(void)
321+
ZTEST_USER(i2s_loopback, test_i2s_transfer_rx_overrun)
322322
{
323323
if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
324324
TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -396,7 +396,7 @@ void test_i2s_transfer_rx_overrun(void)
396396
* - Sending PREPARE trigger after the TX buffer underrun occurred changes
397397
* the interface state to READY.
398398
*/
399-
void test_i2s_transfer_tx_underrun(void)
399+
ZTEST_USER(i2s_loopback, test_i2s_transfer_tx_underrun)
400400
{
401401
if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
402402
TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");

‎tests/drivers/i2s/i2s_api/src/test_i2s_states.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ static ZTEST_DMEM const struct device *dev_i2s_rx;
1313
static ZTEST_DMEM const struct device *dev_i2s_tx;
1414

1515
/** Configure I2S TX transfer. */
16-
void test_i2s_tx_transfer_configure_1(void)
16+
ZTEST_USER(i2s_states, test_i2s_tx_transfer_configure_1)
1717
{
1818
int ret;
1919

@@ -25,7 +25,7 @@ void test_i2s_tx_transfer_configure_1(void)
2525
}
2626

2727
/** Configure I2S RX transfer. */
28-
void test_i2s_rx_transfer_configure_1(void)
28+
ZTEST_USER(i2s_states, test_i2s_rx_transfer_configure_1)
2929
{
3030
int ret;
3131

@@ -43,7 +43,7 @@ void test_i2s_rx_transfer_configure_1(void)
4343
* - An attempt to read RX block in NOT_READY state returns failure.
4444
* - An attempt to write TX block in NOT_READY state returns failure.
4545
*/
46-
void test_i2s_state_not_ready_neg(void)
46+
ZTEST_USER(i2s_states, test_i2s_state_not_ready_neg)
4747
{
4848
struct i2s_config i2s_cfg;
4949
size_t rx_size;
@@ -103,7 +103,7 @@ void test_i2s_state_not_ready_neg(void)
103103
*
104104
* - Sending DRAIN, STOP, PREPARE trigger in READY state returns failure.
105105
*/
106-
void test_i2s_state_ready_neg(void)
106+
ZTEST_USER(i2s_states, test_i2s_state_ready_neg)
107107
{
108108
int ret;
109109

@@ -144,7 +144,7 @@ void test_i2s_state_ready_neg(void)
144144
*
145145
* - Sending START, PREPARE trigger in RUNNING state returns failure.
146146
*/
147-
void test_i2s_state_running_neg(void)
147+
ZTEST_USER(i2s_states, test_i2s_state_running_neg)
148148
{
149149
if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
150150
TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -201,7 +201,7 @@ void test_i2s_state_running_neg(void)
201201
* - Sending START, STOP, DRAIN, PREPARE trigger in STOPPING state returns
202202
* failure.
203203
*/
204-
void test_i2s_state_stopping_neg(void)
204+
ZTEST_USER(i2s_states, test_i2s_state_stopping_neg)
205205
{
206206
if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
207207
TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -271,7 +271,7 @@ void test_i2s_state_stopping_neg(void)
271271
*
272272
* - Sending START, STOP, DRAIN trigger in ERROR state returns failure.
273273
*/
274-
void test_i2s_state_error_neg(void)
274+
ZTEST_USER(i2s_states, test_i2s_state_error_neg)
275275
{
276276
if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
277277
TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");

0 commit comments

Comments
 (0)