Skip to content

Commit 7c6f2d7

Browse files
MariuszSkamracarlescufi
MariuszSkamra
authored and
carlescufi
committed
tests: Bluetooth: ascs: Fix bap_unicast_server_cb mocks
This fixes merge conflict issue by adding missing function parameters that were introduced in 57784df. Signed-off-by: Mariusz Skamra <[email protected]>
1 parent c84fdfe commit 7c6f2d7

File tree

3 files changed

+32
-19
lines changed

3 files changed

+32
-19
lines changed

‎tests/bluetooth/audio/ascs/src/main.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,10 +566,12 @@ static struct bt_bap_stream *stream_allocated;
566566
int unicast_server_cb_config_custom_fake(struct bt_conn *conn, const struct bt_bap_ep *ep,
567567
enum bt_audio_dir dir, const struct bt_codec *codec,
568568
struct bt_bap_stream **stream,
569-
struct bt_codec_qos_pref *const pref)
569+
struct bt_codec_qos_pref *const pref,
570+
struct bt_bap_ascs_rsp *rsp)
570571
{
571572
*stream = stream_allocated;
572573
*pref = qos_pref;
574+
*rsp = BT_BAP_ASCS_RSP(BT_BAP_ASCS_RSP_CODE_SUCCESS, BT_BAP_ASCS_REASON_NONE);
573575

574576
bt_bap_stream_cb_register(*stream, &mock_bap_stream_ops);
575577

‎tests/bluetooth/audio/mocks/include/bap_unicast_server.h‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,24 @@ void mock_bap_unicast_server_cleanup(void);
1717

1818
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_config, struct bt_conn *,
1919
const struct bt_bap_ep *, enum bt_audio_dir, const struct bt_codec *,
20-
struct bt_bap_stream **, struct bt_codec_qos_pref *const);
20+
struct bt_bap_stream **, struct bt_codec_qos_pref *const,
21+
struct bt_bap_ascs_rsp *);
2122
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_reconfig, struct bt_bap_stream *,
2223
enum bt_audio_dir, const struct bt_codec *,
23-
struct bt_codec_qos_pref *const);
24+
struct bt_codec_qos_pref *const, struct bt_bap_ascs_rsp *);
2425
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_qos, struct bt_bap_stream *,
25-
const struct bt_codec_qos *);
26+
const struct bt_codec_qos *, struct bt_bap_ascs_rsp *);
2627
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_enable, struct bt_bap_stream *,
27-
const struct bt_codec_data *, size_t);
28-
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_start, struct bt_bap_stream *);
28+
const struct bt_codec_data *, size_t, struct bt_bap_ascs_rsp *);
29+
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_start, struct bt_bap_stream *,
30+
struct bt_bap_ascs_rsp *);
2931
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_metadata, struct bt_bap_stream *,
30-
const struct bt_codec_data *, size_t);
31-
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_disable, struct bt_bap_stream *);
32-
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_stop, struct bt_bap_stream *);
33-
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_release, struct bt_bap_stream *);
32+
const struct bt_codec_data *, size_t, struct bt_bap_ascs_rsp *);
33+
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_disable, struct bt_bap_stream *,
34+
struct bt_bap_ascs_rsp *);
35+
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_stop, struct bt_bap_stream *,
36+
struct bt_bap_ascs_rsp *);
37+
DECLARE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_release, struct bt_bap_stream *,
38+
struct bt_bap_ascs_rsp *);
3439

3540
#endif /* MOCKS_BAP_UNICAST_SERVER_H_ */

‎tests/bluetooth/audio/mocks/src/bap_unicast_server.c‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,25 @@ void mock_bap_unicast_server_cleanup(void)
3232

3333
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_config, struct bt_conn *,
3434
const struct bt_bap_ep *, enum bt_audio_dir, const struct bt_codec *,
35-
struct bt_bap_stream **, struct bt_codec_qos_pref *const);
35+
struct bt_bap_stream **, struct bt_codec_qos_pref *const,
36+
struct bt_bap_ascs_rsp *);
3637
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_reconfig, struct bt_bap_stream *,
37-
enum bt_audio_dir, const struct bt_codec *, struct bt_codec_qos_pref *const);
38+
enum bt_audio_dir, const struct bt_codec *, struct bt_codec_qos_pref *const,
39+
struct bt_bap_ascs_rsp *);
3840
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_qos, struct bt_bap_stream *,
39-
const struct bt_codec_qos *);
41+
const struct bt_codec_qos *, struct bt_bap_ascs_rsp *);
4042
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_enable, struct bt_bap_stream *,
41-
const struct bt_codec_data *, size_t);
42-
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_start, struct bt_bap_stream *);
43+
const struct bt_codec_data *, size_t, struct bt_bap_ascs_rsp *);
44+
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_start, struct bt_bap_stream *,
45+
struct bt_bap_ascs_rsp *);
4346
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_metadata, struct bt_bap_stream *,
44-
const struct bt_codec_data *, size_t);
45-
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_disable, struct bt_bap_stream *);
46-
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_stop, struct bt_bap_stream *);
47-
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_release, struct bt_bap_stream *);
47+
const struct bt_codec_data *, size_t, struct bt_bap_ascs_rsp *);
48+
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_disable, struct bt_bap_stream *,
49+
struct bt_bap_ascs_rsp *);
50+
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_stop, struct bt_bap_stream *,
51+
struct bt_bap_ascs_rsp *);
52+
DEFINE_FAKE_VALUE_FUNC(int, mock_bap_unicast_server_cb_release, struct bt_bap_stream *,
53+
struct bt_bap_ascs_rsp *);
4854

4955
const struct bt_bap_unicast_server_cb mock_bap_unicast_server_cb = {
5056
.config = mock_bap_unicast_server_cb_config,

0 commit comments

Comments
 (0)