Skip to content

Commit 11da98f

Browse files
ppryga-nordiccarlescufi
authored andcommitted
tests: Bluetooth: df: connectionless cte rx migrate to new ZTEST API
Migrate tests in connectionless_cte_rx to new ZTEST API. Remove main.c source file because is unncessary when automatic unit tests registration is available. Signed-off-by: Piotr Pryga <[email protected]>
1 parent 587319d commit 11da98f

File tree

4 files changed

+30
-86
lines changed

4 files changed

+30
-86
lines changed

tests/bluetooth/df/connectionless_cte_rx/prj.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CONFIG_TEST=y
22
CONFIG_ZTEST=y
3+
CONFIG_ZTEST_NEW_API=y
34

45
CONFIG_BT=y
56
CONFIG_BT_EXT_ADV=y

tests/bluetooth/df/connectionless_cte_rx/src/main.c

Lines changed: 0 additions & 21 deletions
This file was deleted.

tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c

Lines changed: 29 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include <zephyr/sys/byteorder.h>
1414
#include <host/hci_core.h>
1515

16+
#include <bt_common.h>
1617
#include "common.h"
17-
#include "test_set_iq_sampling_enable.h"
1818

1919
struct ut_bt_df_scan_cte_rx_params {
2020
uint8_t slot_durations;
@@ -87,7 +87,7 @@ int send_set_scan_cte_rx_enable(uint16_t sync_handle,
8787
buf, NULL);
8888
}
8989

90-
void test_set_scan_cte_rx_enable_invalid_scan_set_handle(void)
90+
ZTEST(test_hci_set_scan_cte_rx_enable, test_set_scan_cte_rx_enable_invalid_scan_set_handle)
9191
{
9292
int err;
9393

@@ -96,7 +96,7 @@ void test_set_scan_cte_rx_enable_invalid_scan_set_handle(void)
9696
"Unexpected error value for enable IQ sampling with wrong sync handle");
9797
}
9898

99-
void test_set_scan_cte_rx_enable_invalid_antenna_slots_value(void)
99+
ZTEST(test_hci_set_scan_cte_rx_enable, test_set_scan_cte_rx_enable_invalid_antenna_slots_value)
100100
{
101101
int err;
102102

@@ -112,7 +112,7 @@ void test_set_scan_cte_rx_enable_invalid_antenna_slots_value(void)
112112
g_params.slot_durations = slot_durations_prev;
113113
}
114114

115-
void test_set_scan_cte_rx_enable_invalid_antenna_pattern_num(void)
115+
ZTEST(test_hci_set_scan_cte_rx_enable, test_set_scan_cte_rx_enable_invalid_antenna_pattern_num)
116116
{
117117
int err;
118118

@@ -132,7 +132,7 @@ void test_set_scan_cte_rx_enable_invalid_antenna_pattern_num(void)
132132
g_params.ant_ids = ant_ids_prev;
133133
}
134134

135-
void test_set_scan_cte_rx_enable_invalid_cte_count_value(void)
135+
ZTEST(test_hci_set_scan_cte_rx_enable, test_set_scan_cte_rx_enable_invalid_cte_count_value)
136136
{
137137
int err;
138138

@@ -148,7 +148,7 @@ void test_set_scan_cte_rx_enable_invalid_cte_count_value(void)
148148
g_params.cte_count = cte_count_prev;
149149
}
150150

151-
void test_set_scan_cte_rx_enable_with_slot_duration_2us(void)
151+
ZTEST(test_hci_set_scan_cte_rx_enable, test_set_scan_cte_rx_enable_with_slot_duration_2us)
152152
{
153153
int err;
154154

@@ -162,7 +162,7 @@ void test_set_scan_cte_rx_enable_with_slot_duration_2us(void)
162162
g_params.slot_durations = slot_durations_prev;
163163
}
164164

165-
void test_set_scan_cte_rx_enable_with_slot_duration_1us(void)
165+
ZTEST(test_hci_set_scan_cte_rx_enable, test_set_scan_cte_rx_enable_with_slot_duration_1us)
166166
{
167167
int err;
168168

@@ -177,7 +177,7 @@ void test_set_scan_cte_rx_enable_with_slot_duration_1us(void)
177177
g_params.slot_durations = slot_durations_prev;
178178
}
179179

180-
void test_set_scan_cte_rx_enable_with_sample_cte_count_min(void)
180+
ZTEST(test_hci_set_scan_cte_rx_enable, test_set_scan_cte_rx_enable_with_sample_cte_count_min)
181181
{
182182
int err;
183183

@@ -193,7 +193,7 @@ void test_set_scan_cte_rx_enable_with_sample_cte_count_min(void)
193193
g_params.cte_count = cte_count_prev;
194194
}
195195

196-
void test_set_scan_cte_rx_enable_with_sample_cte_count_max(void)
196+
ZTEST(test_hci_set_scan_cte_rx_enable, test_set_scan_cte_rx_enable_with_sample_cte_count_max)
197197
{
198198
int err;
199199

@@ -209,7 +209,7 @@ void test_set_scan_cte_rx_enable_with_sample_cte_count_max(void)
209209
g_params.cte_count = cte_count_prev;
210210
}
211211

212-
void test_set_scan_cte_rx_enable_with_antenna_switch_patterns_min(void)
212+
ZTEST(test_hci_set_scan_cte_rx_enable, test_set_scan_cte_rx_enable_with_antenna_switch_patterns_min)
213213
{
214214
int err;
215215

@@ -228,7 +228,7 @@ void test_set_scan_cte_rx_enable_with_antenna_switch_patterns_min(void)
228228
g_params.ant_ids = ant_ids_prev;
229229
}
230230

231-
void test_set_scan_cte_rx_enable_with_antenna_switch_patterns_max(void)
231+
ZTEST(test_hci_set_scan_cte_rx_enable, test_set_scan_cte_rx_enable_with_antenna_switch_patterns_max)
232232
{
233233
int err;
234234

@@ -247,15 +247,17 @@ void test_set_scan_cte_rx_enable_with_antenna_switch_patterns_max(void)
247247
g_params.ant_ids = ant_ids_prev;
248248
}
249249

250-
void test_set_scan_cte_rx_disable_with_correct_sampling_parameters(void)
250+
ZTEST(test_hci_set_scan_cte_rx_disable,
251+
test_set_scan_cte_rx_disable_with_correct_sampling_parameters)
251252
{
252253
int err;
253254

254255
err = send_set_scan_cte_rx_enable(g_per_sync->handle, &g_params, false);
255256
zassert_equal(err, 0, "Unexpected error value for disable IQ sampling.");
256257
}
257258

258-
void test_set_scan_cte_rx_disable_with_invalid_sampling_parameters(void)
259+
ZTEST(test_hci_set_scan_cte_rx_disable,
260+
test_set_scan_cte_rx_disable_with_invalid_sampling_parameters)
259261
{
260262
int err;
261263

@@ -271,7 +273,7 @@ void test_set_scan_cte_rx_disable_with_invalid_sampling_parameters(void)
271273
zassert_equal(err, 0, "Unexpected error value for disable IQ sampling.");
272274
}
273275

274-
void test_set_scan_cte_rx_disable_when_disabled(void)
276+
ZTEST(test_hci_set_scan_cte_rx_disable, test_set_scan_cte_rx_disable_when_disabled)
275277
{
276278
int err;
277279

@@ -280,62 +282,32 @@ void test_set_scan_cte_rx_disable_when_disabled(void)
280282
"Unexpected error value for disable IQ sampling when it is disabled.");
281283
}
282284

283-
void set_scan_cte_rx_enable_teardown(void)
285+
void set_scan_cte_rx_enable_teardown(void *data)
284286
{
285287
int err;
286288

287289
err = send_set_scan_cte_rx_enable(g_per_sync->handle, &g_params, false);
288290
zassert_equal(err, 0, "Unexpected error value for disable IQ sampling.");
289291
}
290292

291-
void set_scan_cte_rx_disable_setup(void)
293+
void set_scan_cte_rx_disable_setup(void *data)
292294
{
293295
int err;
294296

295297
err = send_set_scan_cte_rx_enable(g_per_sync->handle, &g_params, true);
296298
zassert_equal(err, 0, "Unexpected error value for enable IQ sampling.");
297299
}
298300

299-
void run_set_scan_cte_rx_enable_tests(void)
301+
static void *common_per_sync_setup(void)
300302
{
301-
ztest_test_suite(
302-
test_hci_set_scan_cte_rx_enable,
303-
ztest_unit_test_setup_teardown(
304-
test_set_scan_cte_rx_enable_invalid_scan_set_handle,
305-
unit_test_noop, set_scan_cte_rx_enable_teardown),
306-
ztest_unit_test_setup_teardown(
307-
test_set_scan_cte_rx_enable_invalid_antenna_slots_value,
308-
unit_test_noop, set_scan_cte_rx_enable_teardown),
309-
ztest_unit_test_setup_teardown(
310-
test_set_scan_cte_rx_enable_invalid_antenna_pattern_num,
311-
unit_test_noop, set_scan_cte_rx_enable_teardown),
312-
ztest_unit_test_setup_teardown(
313-
test_set_scan_cte_rx_enable_invalid_cte_count_value,
314-
unit_test_noop, set_scan_cte_rx_enable_teardown),
315-
ztest_unit_test_setup_teardown(
316-
test_set_scan_cte_rx_enable_with_slot_duration_2us,
317-
unit_test_noop, set_scan_cte_rx_enable_teardown),
318-
ztest_unit_test_setup_teardown(
319-
test_set_scan_cte_rx_enable_with_slot_duration_1us,
320-
unit_test_noop, set_scan_cte_rx_enable_teardown),
321-
ztest_unit_test_setup_teardown(
322-
test_set_scan_cte_rx_enable_with_sample_cte_count_min,
323-
unit_test_noop, set_scan_cte_rx_enable_teardown),
324-
ztest_unit_test_setup_teardown(
325-
test_set_scan_cte_rx_enable_with_sample_cte_count_max,
326-
unit_test_noop, set_scan_cte_rx_enable_teardown),
327-
ztest_unit_test_setup_teardown(
328-
test_set_scan_cte_rx_enable_with_antenna_switch_patterns_min,
329-
unit_test_noop, set_scan_cte_rx_enable_teardown),
330-
ztest_unit_test_setup_teardown(
331-
test_set_scan_cte_rx_enable_with_antenna_switch_patterns_max,
332-
unit_test_noop, set_scan_cte_rx_enable_teardown),
333-
ztest_unit_test_setup_teardown(
334-
test_set_scan_cte_rx_disable_with_correct_sampling_parameters,
335-
set_scan_cte_rx_disable_setup, unit_test_noop),
336-
ztest_unit_test_setup_teardown(
337-
test_set_scan_cte_rx_disable_with_invalid_sampling_parameters,
338-
set_scan_cte_rx_disable_setup, unit_test_noop),
339-
ztest_unit_test(test_set_scan_cte_rx_disable_when_disabled));
340-
ztest_run_test_suite(test_hci_set_scan_cte_rx_enable);
303+
ut_bt_setup();
304+
305+
common_create_per_sync_set();
306+
307+
return NULL;
341308
}
309+
310+
ZTEST_SUITE(test_hci_set_scan_cte_rx_enable, NULL, common_per_sync_setup, NULL,
311+
set_scan_cte_rx_enable_teardown, ut_bt_teardown);
312+
ZTEST_SUITE(test_hci_set_scan_cte_rx_disable, NULL, common_per_sync_setup,
313+
set_scan_cte_rx_disable_setup, NULL, ut_bt_teardown);

tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.h

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)