michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: Bluetooth: per_adv_syncer -> per_adv_sync

Browse source 
This ensures the naming convention matches the APIs that
are tested.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
This commit is contained in:
Rubin Gerritsen 2024-04-30 08:40:01 +02:00 • committed by Fabio Baltieri
commit 13699dc660
10 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/bsim/bluetooth/host/adv/periodic/CMakeLists.txt
View file

@ -9,7 +9,7 @@ target_sources(app PRIVATE
src/common.c
src/main.c
src/per_adv_advertiser.c
src/per_adv_syncer.c
src/per_adv_sync.c
)
zephyr_include_directories(

4
tests/bsim/bluetooth/host/adv/periodic/src/main.c
View file

@ -6,11 +6,11 @@
#include "bstests.h"
extern struct bst_test_list *test_per_adv_syncer(struct bst_test_list *tests);
extern struct bst_test_list *test_per_adv_sync(struct bst_test_list *tests);
extern struct bst_test_list *test_per_adv_advertiser(struct bst_test_list *tests);
bst_test_install_t test_installers[] = {
test_per_adv_syncer,
test_per_adv_sync,
test_per_adv_advertiser,
NULL
};

2
tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c
View file

@ -407,7 +407,7 @@ static const struct bst_test_instance per_adv_advertiser[] = {
{
.test_id = "per_adv_long_data_advertiser",
.test_descr = "Periodic advertising test with a longer data length. "
"To test the syncers reassembly of large data packets",
"To test the reassembly of large data packets",
.test_post_init_f = test_init,
.test_tick_f = test_tick,
.test_main_f = main_per_adv_long_data_advertiser

50
tests/bsim/bluetooth/host/adv/periodic/src/per_adv_syncer.c → tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c
View file

@ -237,7 +237,7 @@ static void start_bonding(void)
printk("done.\n");
}
static void main_per_adv_syncer(void)
static void main_per_adv_sync(void)
{
struct bt_le_per_adv_sync *sync = NULL;
@ -253,10 +253,10 @@ static void main_per_adv_syncer(void)
printk("Waiting for periodic sync lost...\n");
WAIT_FOR_FLAG(flag_per_adv_sync_lost);
PASS("Periodic advertising syncer passed\n");
PASS("Periodic advertising sync passed\n");
}
static void main_per_adv_syncer_app_not_scanning(void)
static void main_per_adv_sync_app_not_scanning(void)
{
int err;
struct bt_le_per_adv_sync *sync = NULL;
@ -280,10 +280,10 @@ static void main_per_adv_syncer_app_not_scanning(void)
printk("Waiting for periodic sync lost...\n");
WAIT_FOR_FLAG(flag_per_adv_sync_lost);
PASS("Periodic advertising syncer passed\n");
PASS("Periodic advertising sync passed\n");
}
static void main_per_adv_conn_syncer(void)
static void main_per_adv_conn_sync(void)
{
struct bt_le_per_adv_sync *sync = NULL;
@ -305,10 +305,10 @@ static void main_per_adv_conn_syncer(void)
printk("Waiting for periodic sync lost...\n");
WAIT_FOR_FLAG(flag_per_adv_sync_lost);
PASS("Periodic advertising syncer passed\n");
PASS("Periodic advertising sync passed\n");
}
static void main_per_adv_conn_privacy_syncer(void)
static void main_per_adv_conn_privacy_sync(void)
{
struct bt_le_per_adv_sync *sync = NULL;
@ -336,10 +336,10 @@ static void main_per_adv_conn_privacy_syncer(void)
printk("Waiting for periodic sync lost...\n");
WAIT_FOR_FLAG(flag_per_adv_sync_lost);
PASS("Periodic advertising syncer passed\n");
PASS("Periodic advertising sync passed\n");
}
static void main_per_adv_long_data_syncer(void)
static void main_per_adv_long_data_sync(void)
{
#if (CONFIG_BT_PER_ADV_SYNC_BUF_SIZE > 0)
struct bt_le_per_adv_sync *sync = NULL;
@ -359,58 +359,58 @@ static void main_per_adv_long_data_syncer(void)
printk("Waiting for periodic sync lost...\n");
WAIT_FOR_FLAG(flag_per_adv_sync_lost);
#endif
PASS("Periodic advertising long data syncer passed\n");
PASS("Periodic advertising long data sync passed\n");
}
static const struct bst_test_instance per_adv_syncer[] = {
static const struct bst_test_instance per_adv_sync[] = {
{
.test_id = "per_adv_syncer",
.test_id = "per_adv_sync",
.test_descr = "Basic periodic advertising sync test. "
"Will just sync to a periodic advertiser.",
.test_post_init_f = test_init,
.test_tick_f = test_tick,
.test_main_f = main_per_adv_syncer
.test_main_f = main_per_adv_sync
},
{
.test_id = "per_adv_syncer_app_not_scanning",
.test_id = "per_adv_sync_app_not_scanning",
.test_descr = "Basic periodic advertising sync test but where "
"the app stopped scanning before creating sync."
"Expect the host to start scanning automatically.",
.test_post_init_f = test_init,
.test_tick_f = test_tick,
.test_main_f = main_per_adv_syncer_app_not_scanning
.test_main_f = main_per_adv_sync_app_not_scanning
},
{
.test_id = "per_adv_conn_syncer",
.test_id = "per_adv_conn_sync",
.test_descr = "Periodic advertising sync test, but where there "
"is a connection between the advertiser and the "
"syncer.",
"synchronized device.",
.test_post_init_f = test_init,
.test_tick_f = test_tick,
.test_main_f = main_per_adv_conn_syncer
.test_main_f = main_per_adv_conn_sync
},
{
.test_id = "per_adv_conn_privacy_syncer",
.test_id = "per_adv_conn_privacy_sync",
.test_descr = "Periodic advertising sync test, but where "
"advertiser and syncer are bonded and using "
"advertiser and synchronized device are bonded and using "
"privacy",
.test_post_init_f = test_init,
.test_tick_f = test_tick,
.test_main_f = main_per_adv_conn_privacy_syncer
.test_main_f = main_per_adv_conn_privacy_sync
},
{
.test_id = "per_adv_long_data_syncer",
.test_id = "per_adv_long_data_sync",
.test_descr = "Periodic advertising sync test with larger "
"data length. Test is used to verify that "
"reassembly of long data is handeled correctly.",
.test_post_init_f = test_init,
.test_tick_f = test_tick,
.test_main_f = main_per_adv_long_data_syncer
.test_main_f = main_per_adv_long_data_sync
},
BSTEST_END_MARKER
};
struct bst_test_list *test_per_adv_syncer(struct bst_test_list *tests)
struct bst_test_list *test_per_adv_sync(struct bst_test_list *tests)
{
return bst_add_tests(tests, per_adv_syncer);
return bst_add_tests(tests, per_adv_sync);
}

2
tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv.sh
View file

@ -18,7 +18,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
-v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \
-testid=per_adv_syncer -rs=6
-testid=per_adv_sync -rs=6
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-D=2 -sim_length=20e6 $@

2
tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning.sh
View file

@ -18,7 +18,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
-v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \
-testid=per_adv_syncer_app_not_scanning -rs=6
-testid=per_adv_sync_app_not_scanning -rs=6
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-D=2 -sim_length=20e6 $@

2
tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_app_not_scanning_coded.sh
View file

@ -19,7 +19,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_coded_conf \
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_coded_conf \
-v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \
-testid=per_adv_syncer_app_not_scanning -rs=6
-testid=per_adv_sync_app_not_scanning -rs=6
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-D=2 -sim_length=20e6 $@

2
tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn.sh
View file

@ -18,7 +18,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
-v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \
-testid=per_adv_conn_syncer -rs=6
-testid=per_adv_conn_sync -rs=6
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-D=2 -sim_length=20e6 $@

2
tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_conn_privacy.sh
View file

@ -18,7 +18,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_conf \
-v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \
-testid=per_adv_conn_privacy_syncer -rs=6
-testid=per_adv_conn_privacy_sync -rs=6
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-D=2 -sim_length=20e6 $@

2
tests/bsim/bluetooth/host/adv/periodic/tests_scripts/per_adv_long_data.sh
View file

@ -18,7 +18,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_long_data_co
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_periodic_prj_long_data_conf \
-v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=0 \
-testid=per_adv_long_data_syncer -rs=6
-testid=per_adv_long_data_sync -rs=6
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-D=2 -sim_length=20e6 $@