Skip to content

Commit 82f6b65

Browse files
anhmoltanhmolt
committed
tests: unit: ble_adv: rework testcase logic
To increase readability and maintainability, rework testcase logic to list what modes are enabled instead of listing what modes are disabled. To achieve this, disable all advertising modes in the prj.conf file. Signed-off-by: Andreas Moltumyr <andreas.moltumyr@nordicsemi.no>
1 parent 2a691fd commit 82f6b65

File tree

2 files changed

+68
-62
lines changed

2 files changed

+68
-62
lines changed

‎tests/unit/lib/bluetooth/ble_adv/prj.conf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
CONFIG_UNITY=y
2+
3+
# Disable all modes here so they can be consistently enabled in testcase.yaml.
4+
CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=n
5+
CONFIG_BLE_ADV_DIRECTED_ADVERTISING=n
6+
CONFIG_BLE_ADV_FAST_ADVERTISING=n
7+
CONFIG_BLE_ADV_SLOW_ADVERTISING=n

‎tests/unit/lib/bluetooth/ble_adv/testcase.yaml‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -3,111 +3,111 @@ common:
33
platform_allow: native_sim
44
tags: unittest
55
tests:
6-
lib.ble_adv: {}
7-
lib.ble_adv.directed:
6+
lib.ble_adv.mode_none: {}
7+
lib.ble_adv.mode_slow:
88
extra_configs:
9-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
10-
lib.ble_adv.no_directed_hd:
9+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
10+
lib.ble_adv.mode_fast:
1111
extra_configs:
12-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
13-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=n
14-
lib.ble_adv.no_fast:
12+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
13+
lib.ble_adv.mode_fast_slow:
1514
extra_configs:
16-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
17-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
18-
lib.ble_adv.no_slow:
15+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
16+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
17+
lib.ble_adv.mode_directed:
1918
extra_configs:
2019
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
21-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
22-
lib.ble_adv.no_directed_hd_or_fast:
20+
lib.ble_adv.mode_directed_slow:
2321
extra_configs:
2422
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
25-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=n
26-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
27-
lib.ble_adv.no_directed_hd_or_slow:
23+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
24+
lib.ble_adv.mode_directed_fast:
2825
extra_configs:
2926
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
30-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=n
31-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
32-
lib.ble_adv.no_directed_or_fast:
27+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
28+
lib.ble_adv.mode_directed_fast_slow:
3329
extra_configs:
34-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
35-
lib.ble_adv.no_directed_or_slow:
30+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
31+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
32+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
33+
lib.ble_adv.mode_dhd_directed:
3634
extra_configs:
37-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
38-
lib.ble_adv.no_fast_or_slow:
35+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=y
36+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
37+
lib.ble_adv.mode_dhd_directed_slow:
3938
extra_configs:
39+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=y
4040
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
41-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
42-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
43-
lib.ble_adv.no_directed_hd_or_fast_or_slow:
41+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
42+
lib.ble_adv.mode_dhd_directed_fast:
4443
extra_configs:
44+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=y
4545
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
46-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=n
47-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
48-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
49-
lib.ble_adv.no_directed_or_fast_or_slow:
46+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
47+
lib.ble_adv.mode_dhd_directed_fast_slow:
5048
extra_configs:
51-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
52-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
49+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=y
50+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
51+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
52+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
5353

54-
lib.ble_adv.use_allow_list:
54+
lib.ble_adv.use_allow_list_mode_none:
5555
extra_configs:
5656
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
57-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
58-
lib.ble_adv.use_allow_list_no_directed_hd:
57+
lib.ble_adv.use_allow_list_mode_slow:
5958
extra_configs:
6059
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
61-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
62-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=n
63-
lib.ble_adv.use_allow_list_no_directed:
60+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
61+
lib.ble_adv.use_allow_list_mode_fast:
6462
extra_configs:
6563
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
66-
lib.ble_adv.use_allow_list_no_fast:
64+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
65+
lib.ble_adv.use_allow_list_mode_fast_slow:
6766
extra_configs:
6867
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
69-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
70-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
71-
lib.ble_adv.use_allow_list_no_slow:
68+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
69+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
70+
lib.ble_adv.use_allow_list_mode_directed:
7271
extra_configs:
7372
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
7473
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
75-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
76-
lib.ble_adv.use_allow_list_no_directed_hd_or_fast:
74+
lib.ble_adv.use_allow_list_mode_directed_slow:
7775
extra_configs:
7876
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
7977
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
80-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=n
81-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
82-
lib.ble_adv.use_allow_list_no_directed_hd_or_slow:
78+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
79+
lib.ble_adv.use_allow_list_mode_directed_fast:
8380
extra_configs:
8481
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
8582
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
86-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=n
87-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
88-
lib.ble_adv.use_allow_list_no_directed_or_fast:
83+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
84+
lib.ble_adv.use_allow_list_mode_directed_fast_slow:
8985
extra_configs:
9086
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
91-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
92-
lib.ble_adv.use_allow_list_no_directed_or_slow:
87+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
88+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
89+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
90+
lib.ble_adv.use_allow_list_mode_dhd_directed:
9391
extra_configs:
9492
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
95-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
96-
lib.ble_adv.use_allow_list_no_fast_or_slow:
93+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=y
94+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
95+
lib.ble_adv.use_allow_list_mode_dhd_directed_slow:
9796
extra_configs:
9897
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
98+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=y
9999
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
100-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
101-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
102-
lib.ble_adv.use_allow_list_no_directed_hd_or_fast_or_slow:
100+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y
101+
lib.ble_adv.use_allow_list_mode_dhd_directed_fast:
103102
extra_configs:
104103
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
104+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=y
105105
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
106-
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=n
107-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
108-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
109-
lib.ble_adv.use_allow_list_no_directed_or_fast_or_slow:
106+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
107+
lib.ble_adv.use_allow_list_mode_dhd_directed_fast_slow:
110108
extra_configs:
111109
- CONFIG_BLE_ADV_USE_ALLOW_LIST=y
112-
- CONFIG_BLE_ADV_FAST_ADVERTISING=n
113-
- CONFIG_BLE_ADV_SLOW_ADVERTISING=n
110+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING_HIGH_DUTY=y
111+
- CONFIG_BLE_ADV_DIRECTED_ADVERTISING=y
112+
- CONFIG_BLE_ADV_FAST_ADVERTISING=y
113+
- CONFIG_BLE_ADV_SLOW_ADVERTISING=y

0 commit comments

Comments
 (0)