michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: controller: llcp: expand cen and per

Browse source 
The abbreviations cen and per may be confusing, so they are
expanded into central and peripheral

Signed-off-by: Andries Kruithof <Andries.Kruithof@nordicsemi.no>
This commit is contained in:
Andries Kruithof 2022-02-08 12:23:41 +01:00 • committed by Anas Nashif
commit dcddfb567f
13 changed files with 209 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/bluetooth/controller/ctrl_chmu/src/main.c
View file

@ -50,7 +50,7 @@ static bool is_instant_reached(struct ll_conn *conn, uint16_t instant)
return ((event_counter(conn) - instant) & 0xFFFF) <= 0x7FFF;
}
void test_channel_map_update_cen_loc(void)
void test_channel_map_update_central_loc(void)
{
uint8_t chm[5] = { 0x00, 0x04, 0x05, 0x06, 0x00 };
/* TODO should test setup set this to valid value? */
@ -129,7 +129,7 @@ void test_channel_map_update_cen_loc(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_channel_map_update_per_rem(void)
void test_channel_map_update_periph_rem(void)
{
uint8_t chm[5] = { 0x00, 0x04, 0x05, 0x06, 0x00 };
/* TODO should test setup set this to valid value? */
@ -197,7 +197,7 @@ void test_channel_map_update_per_rem(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_channel_map_update_per_loc(void)
void test_channel_map_update_periph_loc(void)
{
uint8_t err;
uint8_t chm[5] = { 0x00, 0x06, 0x06, 0x06, 0x00 };
@ -218,11 +218,11 @@ void test_channel_map_update_per_loc(void)
void test_main(void)
{
ztest_test_suite(chmu,
ztest_unit_test_setup_teardown(test_channel_map_update_cen_loc, setup,
ztest_unit_test_setup_teardown(test_channel_map_update_central_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_channel_map_update_per_rem, setup,
ztest_unit_test_setup_teardown(test_channel_map_update_periph_rem, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_channel_map_update_per_loc, setup,
ztest_unit_test_setup_teardown(test_channel_map_update_periph_loc, setup,
unit_test_noop));
ztest_run_test_suite(chmu);

158
tests/bluetooth/controller/ctrl_conn_update/src/main.c
View file

@ -190,7 +190,7 @@ static bool is_instant_reached(struct ll_conn *conn, uint16_t instant)
* |<--------------------------| |
* | | |
*/
void test_conn_update_cen_loc_accept(void)
void test_conn_update_central_loc_accept(void)
{
uint8_t err;
struct node_tx *tx;
@ -299,7 +299,7 @@ void test_conn_update_cen_loc_accept(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_cen_loc_reject(void)
void test_conn_update_central_loc_reject(void)
{
uint8_t err;
struct node_tx *tx;
@ -374,7 +374,7 @@ void test_conn_update_cen_loc_reject(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_cen_loc_remote_legacy(void)
void test_conn_update_central_loc_remote_legacy(void)
{
bool feature_bit_param_req;
uint8_t err;
@ -498,7 +498,7 @@ void test_conn_update_cen_loc_remote_legacy(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_cen_loc_unsupp_wo_feat_exch(void)
void test_conn_update_central_loc_unsupp_wo_feat_exch(void)
{
bool feature_bit_param_req;
uint8_t err;
@ -615,7 +615,7 @@ void test_conn_update_cen_loc_unsupp_wo_feat_exch(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_cen_loc_unsupp_w_feat_exch(void)
void test_conn_update_central_loc_unsupp_w_feat_exch(void)
{
uint8_t err;
struct node_tx *tx;
@ -736,7 +736,7 @@ void test_conn_update_cen_loc_unsupp_w_feat_exch(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_cen_loc_collision(void)
void test_conn_update_central_loc_collision(void)
{
uint8_t err;
struct node_tx *tx;
@ -887,7 +887,7 @@ void test_conn_update_cen_loc_collision(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_cen_rem_accept(void)
void test_conn_update_central_rem_accept(void)
{
struct node_tx *tx;
struct node_rx_pdu *ntf;
@ -1001,7 +1001,7 @@ void test_conn_update_cen_rem_accept(void)
* | |-------------------------->|
* | | |
*/
void test_conn_update_cen_rem_reject(void)
void test_conn_update_central_rem_reject(void)
{
struct node_tx *tx;
struct node_rx_pdu *ntf;
@ -1070,7 +1070,7 @@ void test_conn_update_cen_rem_reject(void)
* | |-------------------------->|
* | | |
*/
void test_conn_update_cen_rem_unsupp_feat(void)
void test_conn_update_central_rem_unsupp_feat(void)
{
/* TODO(thoh): Implement when Remote Request machine has feature
* checking
@ -1144,7 +1144,7 @@ void test_conn_update_cen_rem_unsupp_feat(void)
* |<--------------------------| | (B)
* | | |
*/
void test_conn_update_cen_rem_collision(void)
void test_conn_update_central_rem_collision(void)
{
uint8_t err;
struct node_tx *tx;
@ -1341,7 +1341,7 @@ void test_conn_update_cen_rem_collision(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_per_loc_accept(void)
void test_conn_update_periph_loc_accept(void)
{
uint8_t err;
struct node_tx *tx;
@ -1441,7 +1441,7 @@ void test_conn_update_per_loc_accept(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_per_loc_reject(void)
void test_conn_update_periph_loc_reject(void)
{
uint8_t err;
struct node_tx *tx;
@ -1521,7 +1521,7 @@ void test_conn_update_per_loc_reject(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_per_loc_unsupp_feat_wo_feat_exch(void)
void test_conn_update_periph_loc_unsupp_feat_wo_feat_exch(void)
{
uint8_t err;
struct node_tx *tx;
@ -1593,7 +1593,7 @@ void test_conn_update_per_loc_unsupp_feat_wo_feat_exch(void)
* | |-------------------------->|
* | | |
*/
void test_conn_update_per_loc_unsupp_feat_w_feat_exch(void)
void test_conn_update_periph_loc_unsupp_feat_w_feat_exch(void)
{
uint8_t err;
@ -1678,7 +1678,7 @@ void test_conn_update_per_loc_unsupp_feat_w_feat_exch(void)
* | Complete | |
* |<--------------------------| | (B)
*/
void test_conn_update_per_loc_collision(void)
void test_conn_update_periph_loc_collision(void)
{
uint8_t err;
struct node_tx *tx;
@ -1836,7 +1836,7 @@ void test_conn_update_per_loc_collision(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_per_rem_accept(void)
void test_conn_update_periph_rem_accept(void)
{
struct node_tx *tx;
struct node_rx_pdu *ntf;
@ -1957,7 +1957,7 @@ void test_conn_update_per_rem_accept(void)
* | |-------------------------->|
* | | |
*/
void test_conn_update_per_rem_reject(void)
void test_conn_update_periph_rem_reject(void)
{
struct node_tx *tx;
struct node_rx_pdu *ntf;
@ -2030,7 +2030,7 @@ void test_conn_update_per_rem_reject(void)
* | |-------------------------->|
* | | |
*/
void test_conn_update_per_rem_unsupp_feat(void)
void test_conn_update_periph_rem_unsupp_feat(void)
{
/* TODO(thoh): Implement when Remote Request machine has feature
* checking
@ -2104,7 +2104,7 @@ void test_conn_update_per_rem_unsupp_feat(void)
* |<--------------------------| | (B)
* | | |
*/
void test_conn_update_per_rem_collision(void)
void test_conn_update_periph_rem_collision(void)
{
uint8_t err;
struct node_tx *tx;
@ -2291,7 +2291,7 @@ void test_conn_update_per_rem_collision(void)
* | not receive a ntf.) | |
* | | |
*/
void test_conn_update_cen_loc_accept_no_param_req(void)
void test_conn_update_central_loc_accept_no_param_req(void)
{
uint8_t err;
struct node_tx *tx;
@ -2394,7 +2394,7 @@ void test_conn_update_cen_loc_accept_no_param_req(void)
* | | |
* | | |
*/
void test_conn_update_cen_rem_accept_no_param_req(void)
void test_conn_update_central_rem_accept_no_param_req(void)
{
struct node_tx *tx;
@ -2457,7 +2457,7 @@ void test_conn_update_cen_rem_accept_no_param_req(void)
* | not receive a ntf.) | |
* | | |
*/
void test_conn_update_per_rem_accept_no_param_req(void)
void test_conn_update_periph_rem_accept_no_param_req(void)
{
struct node_rx_pdu *ntf;
uint16_t instant;
@ -2540,7 +2540,7 @@ void test_conn_update_per_rem_accept_no_param_req(void)
* |<--------------------------| |
* | | |
*/
void test_conn_update_per_loc_disallowed_no_param_req(void)
void test_conn_update_periph_loc_disallowed_no_param_req(void)
{
uint8_t err;
@ -2574,81 +2574,81 @@ void test_main(void)
{
#if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ)
ztest_test_suite(
cen_loc,
ztest_unit_test_setup_teardown(test_conn_update_cen_loc_accept, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_cen_loc_reject, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_cen_loc_remote_legacy, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_cen_loc_unsupp_wo_feat_exch, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_cen_loc_unsupp_w_feat_exch, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_cen_loc_collision, setup,
unit_test_noop));
central_loc,
ztest_unit_test_setup_teardown(test_conn_update_central_loc_accept,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_central_loc_reject,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_central_loc_remote_legacy,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_central_loc_unsupp_wo_feat_exch,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_central_loc_unsupp_w_feat_exch,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_central_loc_collision,
setup, unit_test_noop));
ztest_test_suite(cen_rem,
ztest_unit_test_setup_teardown(test_conn_update_cen_rem_accept, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_cen_rem_reject, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_cen_rem_unsupp_feat, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_cen_rem_collision, setup,
unit_test_noop));
ztest_test_suite(central_rem,
ztest_unit_test_setup_teardown(test_conn_update_central_rem_accept,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_central_rem_reject,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_central_rem_unsupp_feat,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_central_rem_collision,
setup, unit_test_noop));
ztest_test_suite(
per_loc,
ztest_unit_test_setup_teardown(test_conn_update_per_loc_accept, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_per_loc_reject, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_per_loc_unsupp_feat_wo_feat_exch,
periph_loc,
ztest_unit_test_setup_teardown(test_conn_update_periph_loc_accept,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_per_loc_unsupp_feat_w_feat_exch,
ztest_unit_test_setup_teardown(test_conn_update_periph_loc_reject,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_per_loc_collision, setup,
unit_test_noop));
ztest_unit_test_setup_teardown(test_conn_update_periph_loc_unsupp_feat_wo_feat_exch,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_periph_loc_unsupp_feat_w_feat_exch,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_periph_loc_collision,
setup, unit_test_noop));
ztest_test_suite(per_rem,
ztest_unit_test_setup_teardown(test_conn_update_per_rem_accept, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_per_rem_reject, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_per_rem_unsupp_feat, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_per_rem_collision, setup,
unit_test_noop));
ztest_test_suite(periph_rem,
ztest_unit_test_setup_teardown(test_conn_update_periph_rem_accept,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_periph_rem_reject,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_periph_rem_unsupp_feat,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_conn_update_periph_rem_collision,
setup, unit_test_noop));
ztest_run_test_suite(cen_loc);
ztest_run_test_suite(cen_rem);
ztest_run_test_suite(per_loc);
ztest_run_test_suite(per_rem);
ztest_run_test_suite(central_loc);
ztest_run_test_suite(central_rem);
ztest_run_test_suite(periph_loc);
ztest_run_test_suite(periph_rem);
#else /* !CONFIG_BT_CTLR_CONN_PARAM_REQ */
ztest_test_suite(cen_loc_no_param_req, ztest_unit_test_setup_teardown(
test_conn_update_cen_loc_accept_no_param_req,
ztest_test_suite(central_loc_no_param_req, ztest_unit_test_setup_teardown(
test_conn_update_central_loc_accept_no_param_req,
setup, unit_test_noop));
ztest_test_suite(cen_rem_no_param_req, ztest_unit_test_setup_teardown(
test_conn_update_cen_rem_accept_no_param_req,
ztest_test_suite(central_rem_no_param_req, ztest_unit_test_setup_teardown(
test_conn_update_central_rem_accept_no_param_req,
setup, unit_test_noop));
ztest_test_suite(
per_loc_no_param_req,
ztest_unit_test_setup_teardown(test_conn_update_per_loc_disallowed_no_param_req,
periph_loc_no_param_req,
ztest_unit_test_setup_teardown(test_conn_update_periph_loc_disallowed_no_param_req,
setup, unit_test_noop));
ztest_test_suite(per_rem_no_param_req, ztest_unit_test_setup_teardown(
test_conn_update_per_rem_accept_no_param_req,
ztest_test_suite(periph_rem_no_param_req, ztest_unit_test_setup_teardown(
test_conn_update_periph_rem_accept_no_param_req,
setup, unit_test_noop));
ztest_run_test_suite(cen_loc_no_param_req);
ztest_run_test_suite(cen_rem_no_param_req);
ztest_run_test_suite(per_loc_no_param_req);
ztest_run_test_suite(per_rem_no_param_req);
ztest_run_test_suite(central_loc_no_param_req);
ztest_run_test_suite(central_rem_no_param_req);
ztest_run_test_suite(periph_loc_no_param_req);
ztest_run_test_suite(periph_rem_no_param_req);
#endif /* CONFIG_BT_CTLR_CONN_PARAM_REQ */
}

30
tests/bluetooth/controller/ctrl_data_length_update/src/main.c
View file

@ -71,7 +71,7 @@ static void setup(void)
* | | |
*/
void test_data_length_update_cen_loc(void)
void test_data_length_update_central_loc(void)
{
uint8_t err;
struct node_tx *tx;
@ -146,7 +146,7 @@ void test_data_length_update_cen_loc(void)
* | |<-----------------------------|
* | | |
*/
void test_data_length_update_cen_loc_no_eff_change(void)
void test_data_length_update_central_loc_no_eff_change(void)
{
uint8_t err;
struct node_tx *tx;
@ -218,7 +218,7 @@ void test_data_length_update_cen_loc_no_eff_change(void)
* | | |
*/
void test_data_length_update_cen_loc_no_eff_change2(void)
void test_data_length_update_central_loc_no_eff_change2(void)
{
uint8_t err;
struct node_tx *tx;
@ -286,7 +286,7 @@ void test_data_length_update_cen_loc_no_eff_change2(void)
conn.lll.event_counter);
}
void test_data_length_update_per_loc(void)
void test_data_length_update_periph_loc(void)
{
uint64_t err;
struct node_tx *tx;
@ -347,7 +347,7 @@ void test_data_length_update_per_loc(void)
* | | |
*/
void test_data_length_update_cen_rem(void)
void test_data_length_update_central_rem(void)
{
struct node_tx *tx;
@ -406,7 +406,7 @@ void test_data_length_update_cen_rem(void)
* | | |
*/
void test_data_length_update_per_rem(void)
void test_data_length_update_periph_rem(void)
{
struct node_tx *tx;
@ -481,7 +481,7 @@ void test_data_length_update_per_rem(void)
* | | |
*/
void test_data_length_update_per_rem_and_loc(void)
void test_data_length_update_periph_rem_and_loc(void)
{
uint64_t err;
struct node_tx *tx;
@ -646,21 +646,21 @@ void test_main(void)
{
ztest_test_suite(
data_length_update_central,
ztest_unit_test_setup_teardown(test_data_length_update_cen_loc, setup,
ztest_unit_test_setup_teardown(test_data_length_update_central_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_data_length_update_cen_loc_no_eff_change, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_data_length_update_cen_loc_no_eff_change2,
ztest_unit_test_setup_teardown(test_data_length_update_central_loc_no_eff_change,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_data_length_update_cen_rem, setup,
ztest_unit_test_setup_teardown(test_data_length_update_central_loc_no_eff_change2,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_data_length_update_central_rem, setup,
unit_test_noop));
ztest_test_suite(data_length_update_peripheral,
ztest_unit_test_setup_teardown(test_data_length_update_per_loc, setup,
ztest_unit_test_setup_teardown(test_data_length_update_periph_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_data_length_update_per_rem, setup,
ztest_unit_test_setup_teardown(test_data_length_update_periph_rem, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_data_length_update_per_rem_and_loc,
ztest_unit_test_setup_teardown(test_data_length_update_periph_rem_and_loc,
setup, unit_test_noop)
);

40
tests/bluetooth/controller/ctrl_encrypt/src/main.c
View file

@ -167,7 +167,7 @@ int lll_csrand_get(void *buf, size_t len)
* |<---------------------------| |
* | | |
*/
void test_encryption_start_cen_loc(void)
void test_encryption_start_central_loc(void)
{
uint8_t err;
struct node_tx *tx;
@ -329,7 +329,7 @@ void test_encryption_start_cen_loc(void)
* |<---------------------------| |
* | | |
*/
void test_encryption_start_cen_loc_limited_memory(void)
void test_encryption_start_central_loc_limited_memory(void)
{
uint8_t err;
struct node_tx *tx;
@ -549,7 +549,7 @@ void test_encryption_start_cen_loc_limited_memory(void)
* |<---------------------------| |
* | | |
*/
void test_encryption_start_cen_loc_no_ltk(void)
void test_encryption_start_central_loc_no_ltk(void)
{
uint8_t err;
struct node_tx *tx;
@ -665,7 +665,7 @@ void test_encryption_start_cen_loc_no_ltk(void)
* |<---------------------------| |
* | | |
*/
void test_encryption_start_cen_loc_no_ltk_2(void)
void test_encryption_start_central_loc_no_ltk_2(void)
{
uint8_t err;
struct node_tx *tx;
@ -789,7 +789,7 @@ void test_encryption_start_cen_loc_no_ltk_2(void)
* | |---------------| | |
* | | |
*/
void test_encryption_start_per_rem(void)
void test_encryption_start_periph_rem(void)
{
struct node_tx *tx;
struct node_rx_pdu *ntf;
@ -1010,7 +1010,7 @@ void test_encryption_start_per_rem(void)
* | |---------------| | |
* | | |
*/
void test_encryption_start_per_rem_limited_memory(void)
void test_encryption_start_periph_rem_limited_memory(void)
{
struct node_tx *tx;
struct node_rx_pdu *ntf;
@ -1294,7 +1294,7 @@ void test_encryption_start_per_rem_limited_memory(void)
* | | LL_REJECT_EXT_IND |
* | |-------------------->|
*/
void test_encryption_start_per_rem_no_ltk(void)
void test_encryption_start_periph_rem_no_ltk(void)
{
struct node_tx *tx;
struct node_rx_pdu *ntf;
@ -1419,7 +1419,7 @@ void test_encryption_start_per_rem_no_ltk(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_encryption_pause_cen_loc(void)
void test_encryption_pause_central_loc(void)
{
uint8_t err;
struct node_tx *tx;
@ -1570,7 +1570,7 @@ void test_encryption_pause_cen_loc(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_encryption_pause_per_rem(void)
void test_encryption_pause_periph_rem(void)
{
struct node_tx *tx;
struct node_rx_pdu *ntf;
@ -1750,25 +1750,25 @@ void test_main(void)
{
ztest_test_suite(
encryption_start,
ztest_unit_test_setup_teardown(test_encryption_start_cen_loc, setup,
ztest_unit_test_setup_teardown(test_encryption_start_central_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_encryption_start_cen_loc_limited_memory, setup,
ztest_unit_test_setup_teardown(test_encryption_start_central_loc_limited_memory,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_encryption_start_central_loc_no_ltk, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_encryption_start_cen_loc_no_ltk, setup,
ztest_unit_test_setup_teardown(test_encryption_start_central_loc_no_ltk_2, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_encryption_start_cen_loc_no_ltk_2, setup,
ztest_unit_test_setup_teardown(test_encryption_start_periph_rem, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_encryption_start_per_rem, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_encryption_start_per_rem_limited_memory, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_encryption_start_per_rem_no_ltk, setup,
ztest_unit_test_setup_teardown(test_encryption_start_periph_rem_limited_memory,
setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_encryption_start_periph_rem_no_ltk, setup,
unit_test_noop));
ztest_test_suite(encryption_pause,
ztest_unit_test_setup_teardown(test_encryption_pause_cen_loc, setup,
ztest_unit_test_setup_teardown(test_encryption_pause_central_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_encryption_pause_per_rem, setup,
ztest_unit_test_setup_teardown(test_encryption_pause_periph_rem, setup,
unit_test_noop));
ztest_run_test_suite(encryption_start);

45
tests/bluetooth/controller/ctrl_feature_exchange/src/main.c
View file

@ -72,7 +72,7 @@ static void setup(void)
* |<---------------------------| |
* | | |
*/
void test_feature_exchange_cen_loc(void)
void test_feat_exchange_central_loc(void)
{
uint64_t err;
uint64_t set_featureset[] = { DEFAULT_FEATURE, DEFAULT_FEATURE };
@ -132,7 +132,7 @@ void test_feature_exchange_cen_loc(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_feature_exchange_cen_loc_2(void)
void test_feat_exchange_central_loc_2(void)
{
uint8_t err;
@ -161,8 +161,8 @@ void test_feature_exchange_cen_loc_2(void)
* | |------------------------>|
* | | |
*/
#define CEN_REM_NR_OF_EVENTS 2
void test_feature_exchange_cen_rem(void)
#define CENTRAL_NR_OF_EVENTS 2
void test_feat_exchange_central_rem(void)
{
uint64_t set_featureset[] = {
DEFAULT_FEATURE,
@ -207,14 +207,15 @@ void test_feature_exchange_cen_rem(void)
ull_cp_release_tx(&conn, tx);
}
zassert_equal(conn.lll.event_counter, CEN_REM_NR_OF_EVENTS * (feat_to_test),
zassert_equal(conn.lll.event_counter, CENTRAL_NR_OF_EVENTS * (feat_to_test),
"Wrong event-count %d\n", conn.lll.event_counter);
zassert_equal(ctx_buffers_free(), CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM,
"Free CTX buffers %d", ctx_buffers_free());
}
#define CEN_REM_2_NR_OF_EVENTS 3
void test_feature_exchange_cen_rem_2(void)
#undef CENTRAL_NR_OF_EVENTS
#define CENTRAL_NR_OF_EVENTS 3
void test_feat_exchange_central_rem_2(void)
{
/*
* we could combine some of the following,
@ -294,13 +295,13 @@ void test_feature_exchange_cen_rem_2(void)
ull_cp_release_ntf(ntf);
}
zassert_equal(conn.lll.event_counter, CEN_REM_2_NR_OF_EVENTS * (feat_to_test),
zassert_equal(conn.lll.event_counter, CENTRAL_NR_OF_EVENTS * (feat_to_test),
"Wrong event-count %d\n", conn.lll.event_counter);
zassert_equal(ctx_buffers_free(), CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM,
"Free CTX buffers %d", ctx_buffers_free());
}
void test_peripheral_feature_exchange_per_loc(void)
void test_peripheral_feat_exchange_periph_loc(void)
{
uint64_t err;
uint64_t featureset;
@ -358,7 +359,7 @@ void test_peripheral_feature_exchange_per_loc(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_feature_exchange_per_loc_unknown_rsp(void)
void test_feat_exchange_periph_loc_unknown_rsp(void)
{
uint64_t err;
uint64_t featureset;
@ -424,27 +425,27 @@ void test_hci_main(void);
void test_main(void)
{
ztest_test_suite(feature_exchange_central,
ztest_unit_test_setup_teardown(test_feature_exchange_cen_loc, setup,
ztest_test_suite(feat_exchange_central,
ztest_unit_test_setup_teardown(test_feat_exchange_central_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_feature_exchange_cen_loc_2, setup,
ztest_unit_test_setup_teardown(test_feat_exchange_central_loc_2, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_feature_exchange_cen_rem, setup,
ztest_unit_test_setup_teardown(test_feat_exchange_central_rem, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_feature_exchange_cen_rem_2, setup,
ztest_unit_test_setup_teardown(test_feat_exchange_central_rem_2, setup,
unit_test_noop));
ztest_test_suite(feature_exchange_peripheral,
ztest_unit_test_setup_teardown(test_peripheral_feature_exchange_per_loc,
ztest_test_suite(feat_exchange_peripheral,
ztest_unit_test_setup_teardown(test_peripheral_feat_exchange_periph_loc,
setup, unit_test_noop));
ztest_test_suite(feature_exchange_unknown,
ztest_unit_test_setup_teardown(test_feature_exchange_per_loc_unknown_rsp,
ztest_test_suite(feat_exchange_unknown,
ztest_unit_test_setup_teardown(test_feat_exchange_periph_loc_unknown_rsp,
setup, unit_test_noop));
ztest_run_test_suite(feature_exchange_central);
ztest_run_test_suite(feature_exchange_peripheral);
ztest_run_test_suite(feature_exchange_unknown);
ztest_run_test_suite(feat_exchange_central);
ztest_run_test_suite(feat_exchange_peripheral);
ztest_run_test_suite(feat_exchange_unknown);
test_hci_main();
}

12
tests/bluetooth/controller/ctrl_feature_exchange/src/main_hci.c
View file

@ -74,7 +74,7 @@ static void setup(void)
* |<---------------------------| |
* | | |
*/
void test_hci_feature_exchange_cen_loc(void)
void test_hci_feat_exchange_central_loc(void)
{
uint64_t err;
uint64_t set_featureset[] = {
@ -137,7 +137,7 @@ void test_hci_feature_exchange_cen_loc(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_hci_feature_exchange_wrong_handle(void)
void test_hci_feat_exchange_wrong_handle(void)
{
uint16_t conn_handle;
uint64_t err;
@ -166,13 +166,13 @@ void test_hci_feature_exchange_wrong_handle(void)
void test_hci_main(void)
{
ztest_test_suite(hci_feature_exchange_central,
ztest_unit_test_setup_teardown(test_hci_feature_exchange_cen_loc, setup,
ztest_test_suite(hci_feat_exchange_central,
ztest_unit_test_setup_teardown(test_hci_feat_exchange_central_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_hci_feature_exchange_wrong_handle,
ztest_unit_test_setup_teardown(test_hci_feat_exchange_wrong_handle,
setup, unit_test_noop)
);
ztest_run_test_suite(hci_feature_exchange_central);
ztest_run_test_suite(hci_feat_exchange_central);
}

21
tests/bluetooth/controller/ctrl_le_ping/src/main.c
View file

@ -59,7 +59,7 @@ static void setup(void)
* | | |
* | | |
*/
void test_ping_cen_loc(void)
void test_ping_central_loc(void)
{
uint8_t err;
struct node_tx *tx;
@ -117,7 +117,7 @@ void test_ping_cen_loc(void)
* | | |
* | | |
*/
void test_ping_per_loc(void)
void test_ping_periph_loc(void)
{
uint8_t err;
struct node_tx *tx;
@ -170,7 +170,7 @@ void test_ping_per_loc(void)
* | |------------------>|
* | | |
*/
void test_ping_cen_rem(void)
void test_ping_central_rem(void)
{
struct node_tx *tx;
@ -224,7 +224,7 @@ void test_ping_cen_rem(void)
* | |------------------>|
* | | |
*/
void test_ping_per_rem(void)
void test_ping_periph_rem(void)
{
struct node_tx *tx;
@ -270,10 +270,15 @@ void test_ping_per_rem(void)
void test_main(void)
{
ztest_test_suite(ping,
ztest_unit_test_setup_teardown(test_ping_cen_loc, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_ping_per_loc, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_ping_cen_rem, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_ping_per_rem, setup, unit_test_noop));
ztest_unit_test_setup_teardown(test_ping_central_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_ping_periph_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_ping_central_rem, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_ping_periph_rem, setup,
unit_test_noop)
);
ztest_run_test_suite(ping);
}

16
tests/bluetooth/controller/ctrl_min_used_chans/src/main.c
View file

@ -57,7 +57,7 @@ static void setup(void)
* | | |
* | | |
*/
void test_min_used_chans_per_loc(void)
void test_min_used_chans_periph_loc(void)
{
uint8_t err;
struct node_tx *tx;
@ -104,7 +104,7 @@ void test_min_used_chans_per_loc(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_min_used_chans_cen_loc(void)
void test_min_used_chans_central_loc(void)
{
uint8_t err;
@ -122,7 +122,7 @@ void test_min_used_chans_cen_loc(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_min_used_chans_cen_rem(void)
void test_min_used_chans_central_rem(void)
{
struct pdu_data_llctrl_min_used_chans_ind remote_muc_ind = { .phys = 1,
.min_used_chans = 2 };
@ -170,9 +170,13 @@ void test_main(void)
{
ztest_test_suite(
muc,
ztest_unit_test_setup_teardown(test_min_used_chans_per_loc, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_min_used_chans_cen_loc, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_min_used_chans_cen_rem, setup, unit_test_noop));
ztest_unit_test_setup_teardown(test_min_used_chans_periph_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_min_used_chans_central_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_min_used_chans_central_rem, setup,
unit_test_noop)
);
ztest_run_test_suite(muc);
}

32
tests/bluetooth/controller/ctrl_phy_update/src/main.c
View file

@ -103,7 +103,7 @@ static bool is_instant_reached(struct ll_conn *conn, uint16_t instant)
* +-----+ +-------+ +-----+
* | | |
*/
void test_phy_update_cen_loc(void)
void test_phy_update_central_loc(void)
{
uint8_t err;
struct node_tx *tx;
@ -219,7 +219,7 @@ void test_phy_update_cen_loc(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_phy_update_cen_loc_unsupp_feat(void)
void test_phy_update_central_loc_unsupp_feat(void)
{
uint8_t err;
struct node_tx *tx;
@ -270,7 +270,7 @@ void test_phy_update_cen_loc_unsupp_feat(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_phy_update_cen_rem(void)
void test_phy_update_central_rem(void)
{
struct node_tx *tx;
struct node_rx_pdu *ntf;
@ -369,7 +369,7 @@ void test_phy_update_cen_rem(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_phy_update_per_loc(void)
void test_phy_update_periph_loc(void)
{
uint8_t err;
struct node_tx *tx;
@ -463,7 +463,7 @@ void test_phy_update_per_loc(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_phy_update_per_rem(void)
void test_phy_update_periph_rem(void)
{
struct node_tx *tx;
struct node_rx_pdu *ntf;
@ -567,7 +567,7 @@ void test_phy_update_per_rem(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_phy_update_cen_loc_collision(void)
void test_phy_update_central_loc_collision(void)
{
uint8_t err;
struct node_tx *tx;
@ -738,7 +738,7 @@ void test_phy_update_cen_loc_collision(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_phy_update_cen_rem_collision(void)
void test_phy_update_central_rem_collision(void)
{
uint8_t err;
struct node_tx *tx;
@ -911,7 +911,7 @@ void test_phy_update_cen_rem_collision(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_phy_update_per_loc_collision(void)
void test_phy_update_periph_loc_collision(void)
{
uint8_t err;
struct node_tx *tx;
@ -1044,17 +1044,17 @@ void test_main(void)
{
ztest_test_suite(
phy,
ztest_unit_test_setup_teardown(test_phy_update_cen_loc, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_cen_loc_unsupp_feat, setup,
ztest_unit_test_setup_teardown(test_phy_update_central_loc, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_central_loc_unsupp_feat, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_cen_rem, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_per_loc, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_per_rem, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_cen_loc_collision, setup,
ztest_unit_test_setup_teardown(test_phy_update_central_rem, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_periph_loc, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_periph_rem, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_central_loc_collision, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_cen_rem_collision, setup,
ztest_unit_test_setup_teardown(test_phy_update_central_rem_collision, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_phy_update_per_loc_collision, setup,
ztest_unit_test_setup_teardown(test_phy_update_periph_loc_collision, setup,
unit_test_noop));
ztest_run_test_suite(phy);

16
tests/bluetooth/controller/ctrl_terminate/src/main.c
View file

@ -73,12 +73,12 @@ static void test_terminate_rem(uint8_t role)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_terminate_cen_rem(void)
void test_terminate_central_rem(void)
{
test_terminate_rem(BT_HCI_ROLE_CENTRAL);
}
void test_terminate_per_rem(void)
void test_terminate_periph_rem(void)
{
test_terminate_rem(BT_HCI_ROLE_PERIPHERAL);
}
@ -125,12 +125,12 @@ void test_terminate_loc(uint8_t role)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_terminate_cen_loc(void)
void test_terminate_central_loc(void)
{
test_terminate_loc(BT_HCI_ROLE_CENTRAL);
}
void test_terminate_per_loc(void)
void test_terminate_periph_loc(void)
{
test_terminate_loc(BT_HCI_ROLE_PERIPHERAL);
}
@ -139,10 +139,10 @@ void test_main(void)
{
ztest_test_suite(
term,
ztest_unit_test_setup_teardown(test_terminate_cen_rem, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_terminate_per_rem, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_terminate_cen_loc, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_terminate_per_loc, setup, unit_test_noop));
ztest_unit_test_setup_teardown(test_terminate_central_rem, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_terminate_periph_rem, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_terminate_central_loc, setup, unit_test_noop),
ztest_unit_test_setup_teardown(test_terminate_periph_loc, setup, unit_test_noop));
ztest_run_test_suite(term);
}

22
tests/bluetooth/controller/ctrl_version/src/main.c
View file

@ -62,7 +62,7 @@ static void setup(void)
* |<---------------------------| |
* | | |
*/
void test_version_exchange_cen_loc(void)
void test_version_exchange_central_loc(void)
{
uint8_t err;
struct node_tx *tx;
@ -111,7 +111,7 @@ void test_version_exchange_cen_loc(void)
"Free CTX buffers %d", ctx_buffers_free());
}
void test_version_exchange_cen_loc_2(void)
void test_version_exchange_central_loc_2(void)
{
uint8_t err;
@ -142,7 +142,7 @@ void test_version_exchange_cen_loc_2(void)
* | |------------------>|
* | | |
*/
void test_version_exchange_cen_rem(void)
void test_version_exchange_central_rem(void)
{
struct node_tx *tx;
@ -209,7 +209,7 @@ void test_version_exchange_cen_rem(void)
* |<---------------------------| |
* | | |
*/
void test_version_exchange_cen_rem_2(void)
void test_version_exchange_central_rem_2(void)
{
uint8_t err;
struct node_tx *tx;
@ -284,7 +284,7 @@ void test_version_exchange_cen_rem_2(void)
* |<---------------------------| |
* | | |
*/
void test_version_exchange_cen_loc_twice(void)
void test_version_exchange_central_loc_twice(void)
{
uint8_t err;
struct node_tx *tx;
@ -356,16 +356,16 @@ void test_version_exchange_cen_loc_twice(void)
void test_main(void)
{
ztest_test_suite(version_exchange,
ztest_unit_test_setup_teardown(test_version_exchange_cen_loc, setup,
ztest_unit_test_setup_teardown(test_version_exchange_central_loc, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_version_exchange_cen_loc_2, setup,
ztest_unit_test_setup_teardown(test_version_exchange_central_loc_2, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_version_exchange_cen_rem, setup,
ztest_unit_test_setup_teardown(test_version_exchange_central_rem, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_version_exchange_cen_rem_2, setup,
ztest_unit_test_setup_teardown(test_version_exchange_central_rem_2, setup,
unit_test_noop),
ztest_unit_test_setup_teardown(test_version_exchange_cen_loc_twice, setup,
unit_test_noop));
ztest_unit_test_setup_teardown(test_version_exchange_central_loc_twice,
setup, unit_test_noop));
ztest_run_test_suite(version_exchange);
}