adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

tests: fix various unit tests warnings

Browse source 
Fix various unit test build warnings, unused variables, set but unused
variables, wrong types etc...

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
This commit is contained in:
Fabio Baltieri 2024-12-12 17:05:02 +00:00 committed by Benjamin Cabé
parent 274c848571
commit 8183c991f8
7 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/bluetooth/audio/bap_broadcast_source/src/main.c
View file

@ -19,7 +19,7 @@
#include <zephyr/bluetooth/iso.h> #include <zephyr/bluetooth/iso.h>
#include <zephyr/fff.h> #include <zephyr/fff.h>
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
#include <zephyr/net/buf.h> #include <zephyr/net_buf.h>
#include <zephyr/sys/printk.h> #include <zephyr/sys/printk.h>
#include <zephyr/sys/util_macro.h> #include <zephyr/sys/util_macro.h>

3
tests/bluetooth/audio/cap_commander/src/test_broadcast_reception.c
View file

@ -104,13 +104,12 @@ static void cap_commander_test_broadcast_reception_before(void *f)
static void cap_commander_test_broadcast_reception_after(void *f) static void cap_commander_test_broadcast_reception_after(void *f)
{ {
struct cap_commander_test_broadcast_reception_fixture *fixture = f; struct cap_commander_test_broadcast_reception_fixture *fixture = f;
int err;
bt_cap_commander_unregister_cb(&mock_cap_commander_cb); bt_cap_commander_unregister_cb(&mock_cap_commander_cb);
bt_bap_broadcast_assistant_unregister_cb(&fixture->broadcast_assistant_cb); bt_bap_broadcast_assistant_unregister_cb(&fixture->broadcast_assistant_cb);
/* We need to cleanup since the CAP commander remembers state */ /* We need to cleanup since the CAP commander remembers state */
err = bt_cap_commander_cancel(); (void)bt_cap_commander_cancel();
for (size_t i = 0; i < ARRAY_SIZE(fixture->conns); i++) { for (size_t i = 0; i < ARRAY_SIZE(fixture->conns); i++) {
mock_bt_conn_disconnected(&fixture->conns[i], BT_HCI_ERR_REMOTE_USER_TERM_CONN); mock_bt_conn_disconnected(&fixture->conns[i], BT_HCI_ERR_REMOTE_USER_TERM_CONN);

3
tests/bluetooth/audio/cap_commander/uut/bap_broadcast_assistant.c
View file

@ -182,14 +182,11 @@ int bt_bap_broadcast_assistant_set_broadcast_code(
struct bt_conn *conn, uint8_t src_id, struct bt_conn *conn, uint8_t src_id,
const uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE]) const uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE])
{ {
struct bap_broadcast_assistant_instance *inst;
struct bt_bap_broadcast_assistant_cb *listener, *next; struct bt_bap_broadcast_assistant_cb *listener, *next;
int err; int err;
zassert_not_null(conn, "conn is NULL"); zassert_not_null(conn, "conn is NULL");
inst = inst_by_conn(conn);
zassert_equal(src_id, RANDOM_SRC_ID, "Invalid src_id"); zassert_equal(src_id, RANDOM_SRC_ID, "Invalid src_id");
err = strncmp((const char *)broadcast_code, BROADCAST_CODE, sizeof(BROADCAST_CODE)); err = strncmp((const char *)broadcast_code, BROADCAST_CODE, sizeof(BROADCAST_CODE));

4
tests/bluetooth/audio/codec/src/main.c
View file

@ -659,7 +659,7 @@ ZTEST(audio_codec_test_suite, test_bt_audio_codec_cfg_meta_set_lang)
struct bt_audio_codec_cfg codec_cfg = BT_AUDIO_CODEC_CFG( struct bt_audio_codec_cfg codec_cfg = BT_AUDIO_CODEC_CFG(
BT_HCI_CODING_FORMAT_LC3, 0x0000, 0x0000, {}, BT_HCI_CODING_FORMAT_LC3, 0x0000, 0x0000, {},
{BT_AUDIO_CODEC_DATA(BT_AUDIO_METADATA_TYPE_LANG, 'e', 'n', 'g')}); {BT_AUDIO_CODEC_DATA(BT_AUDIO_METADATA_TYPE_LANG, 'e', 'n', 'g')});
char new_expected_data[] = "deu"; const uint8_t new_expected_data[] = "deu";
char expected_data[] = "eng"; char expected_data[] = "eng";
const uint8_t *lang; const uint8_t *lang;
int ret; int ret;
@ -1701,7 +1701,7 @@ ZTEST(audio_codec_test_suite, test_bt_audio_codec_cap_meta_set_lang)
struct bt_audio_codec_cap codec_cap = BT_AUDIO_CODEC_CAP( struct bt_audio_codec_cap codec_cap = BT_AUDIO_CODEC_CAP(
BT_HCI_CODING_FORMAT_LC3, 0x0000, 0x0000, {}, BT_HCI_CODING_FORMAT_LC3, 0x0000, 0x0000, {},
{BT_AUDIO_CODEC_DATA(BT_AUDIO_METADATA_TYPE_LANG, 'e', 'n', 'g')}); {BT_AUDIO_CODEC_DATA(BT_AUDIO_METADATA_TYPE_LANG, 'e', 'n', 'g')});
char new_expected_data[] = "deu"; const uint8_t new_expected_data[] = "deu";
char expected_data[] = "eng"; char expected_data[] = "eng";
const uint8_t *lang; const uint8_t *lang;
int ret; int ret;

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

@ -589,13 +589,10 @@ ZTEST(phy_periph, test_phy_update_periph_loc_invalid_central)
{ {
uint8_t err; uint8_t err;
struct node_tx *tx; struct node_tx *tx;
struct node_rx_pdu *ntf;
struct pdu_data_llctrl_phy_req req = { .rx_phys = PHY_2M, .tx_phys = PHY_2M }; struct pdu_data_llctrl_phy_req req = { .rx_phys = PHY_2M, .tx_phys = PHY_2M };
uint16_t instant; uint16_t instant;
struct pdu_data_llctrl_conn_param_req conn_param_req = { }; struct pdu_data_llctrl_conn_param_req conn_param_req = { };
struct node_rx_pu pu = { .status = BT_HCI_ERR_SUCCESS };
struct pdu_data_llctrl_phy_upd_ind phy_update_ind = { .c_to_p_phy = PHY_2M, struct pdu_data_llctrl_phy_upd_ind phy_update_ind = { .c_to_p_phy = PHY_2M,
.p_to_c_phy = PHY_2M }; .p_to_c_phy = PHY_2M };

1
tests/bluetooth/host/conn/mocks/scan.c
View file

@ -5,6 +5,7 @@
*/ */
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
#include <zephyr/bluetooth/conn.h>
#include "scan.h" #include "scan.h"

2
tests/unit/pot/nhpot.cpp
View file

@ -39,7 +39,7 @@ ZTEST(pot, test_constexpr_NHPOT)
zassert_equal(0, NHPOT(UINT64_MAX)); zassert_equal(0, NHPOT(UINT64_MAX));
zassert_equal(64, val); zassert_equal(64, val);
zassert_equal(64, nhpot(42)); zassert_equal(64ULL, nhpot(42ULL));
zassert_equal(BIT64(33), val64); zassert_equal(BIT64(33), val64);
zassert_equal(BIT64(33), nhpot(42 + BIT64(32))); zassert_equal(BIT64(33), nhpot(42 + BIT64(32)));
} }