tests: fix various unit tests warnings

Fix various unit test build warnings, unused variables, set but unused variables, wrong types etc... Signed-off-by: Fabio Baltieri <[email protected]>
zephyrproject-rtos · Dec 12, 2024 · 1a12288 · 1a12288
1 parent d70098a
commit 1a12288
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 13 deletions.
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
@@ -139,7 +139,7 @@ void frag_destroy(struct net_buf *frag)
 	/* allow next view to be allocated (and unlock the parent buf) */
 	bt_buf_destroy_view(frag, &get_frag_md(frag)->view_meta);
 
-	LOG_DBG("");
+	LOG_DBG("%s", __func__);
 
 	/* Kick the TX processor to send the rest of the frags. */
 	bt_tx_irq_raise();

diff --git a/tests/bluetooth/audio/bap_broadcast_source/src/main.c b/tests/bluetooth/audio/bap_broadcast_source/src/main.c
@@ -19,7 +19,7 @@
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/fff.h>
 #include <zephyr/kernel.h>
-#include <zephyr/net/buf.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util_macro.h>
 

diff --git a/tests/bluetooth/audio/cap_commander/src/test_broadcast_reception.c b/tests/bluetooth/audio/cap_commander/src/test_broadcast_reception.c
@@ -104,13 +104,12 @@ static void cap_commander_test_broadcast_reception_before(void *f)
 static void cap_commander_test_broadcast_reception_after(void *f)
 {
 	struct cap_commander_test_broadcast_reception_fixture *fixture = f;
-	int err;
 
 	bt_cap_commander_unregister_cb(&mock_cap_commander_cb);
 	bt_bap_broadcast_assistant_unregister_cb(&fixture->broadcast_assistant_cb);
 
 	/* We need to cleanup since the CAP commander remembers state */
-	err = bt_cap_commander_cancel();
+	bt_cap_commander_cancel();
 
 	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);

diff --git a/tests/bluetooth/audio/cap_commander/uut/bap_broadcast_assistant.c b/tests/bluetooth/audio/cap_commander/uut/bap_broadcast_assistant.c
@@ -182,14 +182,11 @@ int bt_bap_broadcast_assistant_set_broadcast_code(
 	struct bt_conn *conn, uint8_t src_id,
 	const uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE])
 {
-	struct bap_broadcast_assistant_instance *inst;
 	struct bt_bap_broadcast_assistant_cb *listener, *next;
 	int err;
 
 	zassert_not_null(conn, "conn is NULL");
 
-	inst = inst_by_conn(conn);
-
 	zassert_equal(src_id, RANDOM_SRC_ID, "Invalid src_id");
 
 	err = strncmp((const char *)broadcast_code, BROADCAST_CODE, sizeof(BROADCAST_CODE));

diff --git a/tests/bluetooth/audio/codec/src/main.c b/tests/bluetooth/audio/codec/src/main.c
@@ -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(
 		BT_HCI_CODING_FORMAT_LC3, 0x0000, 0x0000, {},
 		{BT_AUDIO_CODEC_DATA(BT_AUDIO_METADATA_TYPE_LANG, 'e', 'n', 'g')});
-	char new_expected_data[] = "deu";
+	unsigned char new_expected_data[] = "deu";
 	char expected_data[] = "eng";
 	const uint8_t *lang;
 	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(
 		BT_HCI_CODING_FORMAT_LC3, 0x0000, 0x0000, {},
 		{BT_AUDIO_CODEC_DATA(BT_AUDIO_METADATA_TYPE_LANG, 'e', 'n', 'g')});
-	char new_expected_data[] = "deu";
+	unsigned char new_expected_data[] = "deu";
 	char expected_data[] = "eng";
 	const uint8_t *lang;
 	int ret;

diff --git a/tests/bluetooth/controller/ctrl_phy_update/src/main.c b/tests/bluetooth/controller/ctrl_phy_update/src/main.c
@@ -589,13 +589,10 @@ ZTEST(phy_periph, test_phy_update_periph_loc_invalid_central)
 {
 	uint8_t err;
 	struct node_tx *tx;
-	struct node_rx_pdu *ntf;
 	struct pdu_data_llctrl_phy_req req = { .rx_phys = PHY_2M, .tx_phys = PHY_2M };
 	uint16_t instant;
 	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,
 							      .p_to_c_phy = PHY_2M };
 

diff --git a/tests/bluetooth/host/conn/mocks/scan.c b/tests/bluetooth/host/conn/mocks/scan.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include "scan.h"
 

diff --git a/tests/unit/pot/nhpot.cpp b/tests/unit/pot/nhpot.cpp
@@ -39,7 +39,7 @@ ZTEST(pot, test_constexpr_NHPOT)
 	zassert_equal(0, NHPOT(UINT64_MAX));
 
 	zassert_equal(64, val);
-	zassert_equal(64, nhpot(42));
+	zassert_equal(64, nhpot(42ULL));
 	zassert_equal(BIT64(33), val64);
 	zassert_equal(BIT64(33), nhpot(42 + BIT64(32)));
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
      */
     #include <zephyr/kernel.h>
+    #include <zephyr/bluetooth/conn.h>
     #include "scan.h"
@@ Expand Down @@