Skip to content

Commit 31f0537

Browse files
MariuszSkamraqipengzha
MariuszSkamra
authored and
qipengzha
committed
tests: Bluetooth: ascs: Factor out call count verification function
Reduce code duplicates by using common function to verify mock function call count. Signed-off-by: Mariusz Skamra <[email protected]>
1 parent 7db3800 commit 31f0537

File tree

3 files changed

+36
-87
lines changed

3 files changed

+36
-87
lines changed

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

Lines changed: 20 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
do { \
1717
const char *func_name = "bt_bap_stream_ops.configured"; \
1818
\
19-
zexpect_equal(1, mock_bap_stream_configured_cb_fake.call_count, \
20-
"'%s()' was called %u times, but expected once", \
21-
func_name, mock_bap_stream_configured_cb_fake.call_count); \
19+
zexpect_call_count(func_name, 1, mock_bap_stream_configured_cb_fake.call_count); \
2220
\
2321
if (mock_bap_stream_configured_cb_fake.call_count > 0) { \
2422
IF_NOT_EMPTY(_stream, ( \
@@ -36,17 +34,14 @@ static inline void expect_bt_bap_stream_ops_configured_not_called(void)
3634
{
3735
const char *func_name = "bt_bap_stream_ops.configured";
3836

39-
zexpect_equal(0, mock_bap_stream_configured_cb_fake.call_count,
40-
"'%s()' was called unexpectedly", func_name);
37+
zexpect_call_count(func_name, 0, mock_bap_stream_configured_cb_fake.call_count);
4138
}
4239

4340
static inline void expect_bt_bap_stream_ops_qos_set_called_once(struct bt_bap_stream *stream)
4441
{
4542
const char *func_name = "bt_bap_stream_ops.qos_set";
4643

47-
zexpect_equal(1, mock_bap_stream_qos_set_cb_fake.call_count,
48-
"'%s()' was called %u times, but expected once",
49-
func_name, mock_bap_stream_qos_set_cb_fake.call_count);
44+
zexpect_call_count(func_name, 1, mock_bap_stream_qos_set_cb_fake.call_count);
5045

5146
if (mock_bap_stream_qos_set_cb_fake.call_count > 0) {
5247
zexpect_equal_ptr(stream, mock_bap_stream_qos_set_cb_fake.arg0_val,
@@ -58,17 +53,14 @@ static inline void expect_bt_bap_stream_ops_qos_set_not_called(void)
5853
{
5954
const char *func_name = "bt_bap_stream_ops.qos_set";
6055

61-
zexpect_equal(0, mock_bap_stream_qos_set_cb_fake.call_count,
62-
"'%s()' was called unexpectedly", func_name);
56+
zexpect_call_count(func_name, 0, mock_bap_stream_qos_set_cb_fake.call_count);
6357
}
6458

6559
static inline void expect_bt_bap_stream_ops_enabled_called_once(struct bt_bap_stream *stream)
6660
{
6761
const char *func_name = "bt_bap_stream_ops.enabled";
6862

69-
zexpect_equal(1, mock_bap_stream_enabled_cb_fake.call_count,
70-
"'%s()' was called %u times, but expected once",
71-
func_name, mock_bap_stream_enabled_cb_fake.call_count);
63+
zexpect_call_count(func_name, 1, mock_bap_stream_enabled_cb_fake.call_count);
7264

7365
if (mock_bap_stream_enabled_cb_fake.call_count > 0) {
7466
zexpect_equal_ptr(stream, mock_bap_stream_enabled_cb_fake.arg0_val,
@@ -80,18 +72,15 @@ static inline void expect_bt_bap_stream_ops_enabled_not_called(void)
8072
{
8173
const char *func_name = "bt_bap_stream_ops.enabled";
8274

83-
zexpect_equal(0, mock_bap_stream_enabled_cb_fake.call_count,
84-
"'%s()' was called unexpectedly", func_name);
75+
zexpect_call_count(func_name, 0, mock_bap_stream_enabled_cb_fake.call_count);
8576
}
8677

8778
static inline void expect_bt_bap_stream_ops_metadata_updated_called_once(
8879
struct bt_bap_stream *stream)
8980
{
9081
const char *func_name = "bt_bap_stream_ops.metadata_updated";
9182

92-
zexpect_equal(1, mock_bap_stream_metadata_updated_cb_fake.call_count,
93-
"'%s()' was called %u times, but expected once",
94-
func_name, mock_bap_stream_metadata_updated_cb_fake.call_count);
83+
zexpect_call_count(func_name, 1, mock_bap_stream_metadata_updated_cb_fake.call_count);
9584

9685
if (mock_bap_stream_metadata_updated_cb_fake.call_count > 0) {
9786
zexpect_equal_ptr(stream, mock_bap_stream_metadata_updated_cb_fake.arg0_val,
@@ -103,17 +92,14 @@ static inline void expect_bt_bap_stream_ops_metadata_updated_not_called(void)
10392
{
10493
const char *func_name = "bt_bap_stream_ops.metadata_updated";
10594

106-
zexpect_equal(0, mock_bap_stream_metadata_updated_cb_fake.call_count,
107-
"'%s()' was called unexpectedly", func_name);
95+
zexpect_call_count(func_name, 0, mock_bap_stream_metadata_updated_cb_fake.call_count);
10896
}
10997

11098
static inline void expect_bt_bap_stream_ops_disabled_called_once(struct bt_bap_stream *stream)
11199
{
112100
const char *func_name = "bt_bap_stream_ops.disabled";
113101

114-
zexpect_equal(1, mock_bap_stream_disabled_cb_fake.call_count,
115-
"'%s()' was called %u times, but expected once",
116-
func_name, mock_bap_stream_disabled_cb_fake.call_count);
102+
zexpect_call_count(func_name, 1, mock_bap_stream_disabled_cb_fake.call_count);
117103

118104
if (mock_bap_stream_disabled_cb_fake.call_count > 0) {
119105
zexpect_equal_ptr(stream, mock_bap_stream_disabled_cb_fake.arg0_val,
@@ -125,18 +111,15 @@ static inline void expect_bt_bap_stream_ops_disabled_not_called(void)
125111
{
126112
const char *func_name = "bt_bap_stream_ops.disabled";
127113

128-
zexpect_equal(0, mock_bap_stream_disabled_cb_fake.call_count,
129-
"'%s()' was called unexpectedly", func_name);
114+
zexpect_call_count(func_name, 0, mock_bap_stream_disabled_cb_fake.call_count);
130115
}
131116

132117
static inline void expect_bt_bap_stream_ops_released_called_twice(
133118
const struct bt_bap_stream *streams[2])
134119
{
135120
const char *func_name = "bt_bap_stream_ops.released";
136121

137-
zexpect_equal(2, mock_bap_stream_released_cb_fake.call_count,
138-
"'%s()' was called %u times, but expected once",
139-
func_name, mock_bap_stream_released_cb_fake.call_count);
122+
zexpect_call_count(func_name, 2, mock_bap_stream_released_cb_fake.call_count);
140123

141124
if (mock_bap_stream_released_cb_fake.call_count > 0) {
142125
zexpect_equal_ptr(streams[0], mock_bap_stream_released_cb_fake.arg0_history[0],
@@ -153,9 +136,7 @@ static inline void expect_bt_bap_stream_ops_released_called_once(struct bt_bap_s
153136
{
154137
const char *func_name = "bt_bap_stream_ops.released";
155138

156-
zexpect_equal(1, mock_bap_stream_released_cb_fake.call_count,
157-
"'%s()' was called %u times, but expected once",
158-
func_name, mock_bap_stream_released_cb_fake.call_count);
139+
zexpect_call_count(func_name, 1, mock_bap_stream_released_cb_fake.call_count);
159140

160141
if (mock_bap_stream_released_cb_fake.call_count > 0) {
161142
zexpect_equal_ptr(stream, mock_bap_stream_released_cb_fake.arg0_val,
@@ -175,9 +156,7 @@ static inline void expect_bt_bap_stream_ops_started_called_once(struct bt_bap_st
175156
{
176157
const char *func_name = "bt_bap_stream_ops.started";
177158

178-
zexpect_equal(1, mock_bap_stream_started_cb_fake.call_count,
179-
"'%s()' was called %u times, but expected once",
180-
func_name, mock_bap_stream_started_cb_fake.call_count);
159+
zexpect_call_count(func_name, 1, mock_bap_stream_started_cb_fake.call_count);
181160

182161
if (mock_bap_stream_started_cb_fake.call_count > 0) {
183162
zexpect_equal_ptr(stream, mock_bap_stream_started_cb_fake.arg0_val,
@@ -189,17 +168,14 @@ static inline void expect_bt_bap_stream_ops_started_not_called(void)
189168
{
190169
const char *func_name = "bt_bap_stream_ops.started";
191170

192-
zexpect_equal(0, mock_bap_stream_started_cb_fake.call_count,
193-
"'%s()' was called unexpectedly", func_name);
171+
zexpect_call_count(func_name, 0, mock_bap_stream_started_cb_fake.call_count);
194172
}
195173

196174
#define expect_bt_bap_stream_ops_stopped_called_once(_stream, _reason) \
197175
do { \
198176
const char *func_name = "bt_bap_stream_ops.stopped"; \
199177
\
200-
zexpect_equal(1, mock_bap_stream_stopped_cb_fake.call_count, \
201-
"'%s()' was called %u times, but expected once", \
202-
func_name, mock_bap_stream_stopped_cb_fake.call_count); \
178+
zexpect_call_count(func_name, 1, mock_bap_stream_stopped_cb_fake.call_count); \
203179
\
204180
if (mock_bap_stream_stopped_cb_fake.call_count > 0) { \
205181
IF_NOT_EMPTY(_stream, ( \
@@ -218,8 +194,7 @@ static inline void expect_bt_bap_stream_ops_stopped_not_called(void)
218194
{
219195
const char *func_name = "bt_bap_stream_ops.stopped";
220196

221-
zexpect_equal(0, mock_bap_stream_stopped_cb_fake.call_count,
222-
"'%s()' was called unexpectedly", func_name);
197+
zexpect_call_count(func_name, 0, mock_bap_stream_stopped_cb_fake.call_count);
223198
}
224199

225200
static inline void expect_bt_bap_stream_ops_recv_called_once(struct bt_bap_stream *stream,
@@ -228,9 +203,7 @@ static inline void expect_bt_bap_stream_ops_recv_called_once(struct bt_bap_strea
228203
{
229204
const char *func_name = "bt_bap_stream_ops.recv";
230205

231-
zexpect_equal(1, mock_bap_stream_recv_cb_fake.call_count,
232-
"'%s()' was called %u times, but expected once",
233-
func_name, mock_bap_stream_recv_cb_fake.call_count);
206+
zexpect_call_count(func_name, 1, mock_bap_stream_recv_cb_fake.call_count);
234207

235208
if (mock_bap_stream_recv_cb_fake.call_count > 0) {
236209
zexpect_equal_ptr(stream, mock_bap_stream_recv_cb_fake.arg0_val,
@@ -244,17 +217,14 @@ static inline void expect_bt_bap_stream_ops_recv_not_called(void)
244217
{
245218
const char *func_name = "bt_bap_stream_ops.recv";
246219

247-
zexpect_equal(0, mock_bap_stream_recv_cb_fake.call_count,
248-
"'%s()' was called unexpectedly", func_name);
220+
zexpect_call_count(func_name, 0, mock_bap_stream_recv_cb_fake.call_count);
249221
}
250222

251223
static inline void expect_bt_bap_stream_ops_sent_called_once(struct bt_bap_stream *stream)
252224
{
253225
const char *func_name = "bt_bap_stream_ops.sent";
254226

255-
zexpect_equal(1, mock_bap_stream_sent_cb_fake.call_count,
256-
"'%s()' was called %u times, but expected once",
257-
func_name, mock_bap_stream_sent_cb_fake.call_count);
227+
zexpect_call_count(func_name, 1, mock_bap_stream_sent_cb_fake.call_count);
258228

259229
if (mock_bap_stream_sent_cb_fake.call_count > 0) {
260230
zexpect_equal_ptr(stream, mock_bap_stream_sent_cb_fake.arg0_val,
@@ -266,8 +236,7 @@ static inline void expect_bt_bap_stream_ops_sent_not_called(void)
266236
{
267237
const char *func_name = "bt_bap_stream_ops.sent";
268238

269-
zexpect_equal(0, mock_bap_stream_sent_cb_fake.call_count,
270-
"'%s()' was called unexpectedly", func_name);
239+
zexpect_call_count(func_name, 0, mock_bap_stream_sent_cb_fake.call_count);
271240
}
272241

273242
#endif /* MOCKS_BAP_STREAM_EXPECTS_H_ */

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

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
do { \
1717
const char *func_name = "bt_bap_unicast_server_cb.config"; \
1818
\
19-
zassert_equal(1, mock_bap_unicast_server_cb_config_fake.call_count, \
20-
"'%s()' was called %u times, but expected once", \
21-
func_name, mock_bap_unicast_server_cb_config_fake.call_count); \
19+
zexpect_call_count(func_name, 1, mock_bap_unicast_server_cb_config_fake.call_count); \
2220
\
2321
IF_NOT_EMPTY(_conn, ( \
2422
zassert_equal_ptr(_conn, mock_bap_unicast_server_cb_config_fake.arg0_val, \
@@ -44,10 +42,7 @@ do {
4442
do { \
4543
const char *func_name = "bt_bap_unicast_server_cb.reconfig"; \
4644
\
47-
zassert_true(mock_bap_unicast_server_cb_reconfig_fake.call_count > 0, \
48-
"'%s()' was not called", func_name); \
49-
zassert_equal(1, mock_bap_unicast_server_cb_reconfig_fake.call_count, \
50-
"'%s()' was called more than once", func_name); \
45+
zexpect_call_count(func_name, 1, mock_bap_unicast_server_cb_reconfig_fake.call_count); \
5146
\
5247
IF_NOT_EMPTY(_stream, ( \
5348
zassert_equal_ptr(_stream, mock_bap_unicast_server_cb_reconfig_fake.arg0_val, \
@@ -68,9 +63,7 @@ do {
6863
do { \
6964
const char *func_name = "bt_bap_unicast_server_cb.qos"; \
7065
\
71-
zassert_equal(1, mock_bap_unicast_server_cb_qos_fake.call_count, \
72-
"'%s()' was called %u times, but expected once", \
73-
func_name, mock_bap_unicast_server_cb_qos_fake.call_count); \
66+
zexpect_call_count(func_name, 1, mock_bap_unicast_server_cb_qos_fake.call_count); \
7467
\
7568
IF_NOT_EMPTY(_stream, ( \
7669
zassert_equal_ptr(_stream, mock_bap_unicast_server_cb_qos_fake.arg0_val, \
@@ -86,9 +79,7 @@ do {
8679
do { \
8780
const char *func_name = "bt_bap_unicast_server_cb.enable"; \
8881
\
89-
zassert_equal(1, mock_bap_unicast_server_cb_enable_fake.call_count, \
90-
"'%s()' was called %u times, but expected once", \
91-
func_name, mock_bap_unicast_server_cb_enable_fake.call_count); \
82+
zexpect_call_count(func_name, 1, mock_bap_unicast_server_cb_enable_fake.call_count); \
9283
\
9384
IF_NOT_EMPTY(_stream, ( \
9485
zassert_equal_ptr(_stream, mock_bap_unicast_server_cb_enable_fake.arg0_val, \
@@ -108,10 +99,7 @@ do {
10899
do { \
109100
const char *func_name = "bt_bap_unicast_server_cb.enable"; \
110101
\
111-
zassert_true(mock_bap_unicast_server_cb_metadata_fake.call_count > 0, \
112-
"'%s()' was not called", func_name); \
113-
zassert_equal(1, mock_bap_unicast_server_cb_metadata_fake.call_count, \
114-
"'%s()' was called more than once", func_name); \
102+
zexpect_call_count(func_name, 1, mock_bap_unicast_server_cb_metadata_fake.call_count); \
115103
\
116104
IF_NOT_EMPTY(_stream, ( \
117105
zassert_equal_ptr(_stream, mock_bap_unicast_server_cb_metadata_fake.arg0_val, \
@@ -131,9 +119,7 @@ do {
131119
do { \
132120
const char *func_name = "bt_bap_unicast_server_cb.disable"; \
133121
\
134-
zassert_equal(1, mock_bap_unicast_server_cb_disable_fake.call_count, \
135-
"'%s()' was called %u times, but expected once", \
136-
func_name, mock_bap_unicast_server_cb_disable_fake.call_count); \
122+
zexpect_call_count(func_name, 1, mock_bap_unicast_server_cb_disable_fake.call_count); \
137123
\
138124
IF_NOT_EMPTY(_stream, ( \
139125
zassert_equal_ptr(_stream, mock_bap_unicast_server_cb_disable_fake.arg0_val, \
@@ -145,9 +131,7 @@ do {
145131
do { \
146132
const char *func_name = "bt_bap_unicast_server_cb.release"; \
147133
\
148-
zassert_equal(1, mock_bap_unicast_server_cb_release_fake.call_count, \
149-
"'%s()' was called %u times, but expected once", \
150-
func_name, mock_bap_unicast_server_cb_release_fake.call_count); \
134+
zexpect_call_count(func_name, 1, mock_bap_unicast_server_cb_release_fake.call_count); \
151135
\
152136
IF_NOT_EMPTY(_stream, ( \
153137
zassert_equal_ptr(_stream, mock_bap_unicast_server_cb_release_fake.arg0_val, \
@@ -159,9 +143,7 @@ do {
159143
do { \
160144
const char *func_name = "bt_bap_unicast_server_cb.release"; \
161145
\
162-
zassert_equal(2, mock_bap_unicast_server_cb_release_fake.call_count, \
163-
"'%s()' was called %u times, but expected once", \
164-
func_name, mock_bap_unicast_server_cb_release_fake.call_count); \
146+
zexpect_call_count(func_name, 2, mock_bap_unicast_server_cb_release_fake.call_count); \
165147
\
166148
IF_NOT_EMPTY(_stream[0], ( \
167149
zassert_equal_ptr(_streams[0], \
@@ -179,10 +161,7 @@ do {
179161
do { \
180162
const char *func_name = "bt_bap_unicast_server_cb.start"; \
181163
\
182-
zassert_true(mock_bap_unicast_server_cb_start_fake.call_count > 0, \
183-
"'%s()' was not called", func_name); \
184-
zassert_equal(1, mock_bap_unicast_server_cb_start_fake.call_count, \
185-
"'%s()' was called more than once", func_name); \
164+
zexpect_call_count(func_name, 1, mock_bap_unicast_server_cb_start_fake.call_count); \
186165
\
187166
IF_NOT_EMPTY(_stream, ( \
188167
zassert_equal_ptr(_stream, mock_bap_unicast_server_cb_start_fake.arg0_val, \
@@ -194,10 +173,7 @@ do {
194173
do { \
195174
const char *func_name = "bt_bap_unicast_server_cb.stop"; \
196175
\
197-
zassert_true(mock_bap_unicast_server_cb_stop_fake.call_count > 0, \
198-
"'%s()' was not called", func_name); \
199-
zassert_equal(1, mock_bap_unicast_server_cb_stop_fake.call_count, \
200-
"'%s()' was called more than once", func_name); \
176+
zexpect_call_count(func_name, 1, mock_bap_unicast_server_cb_stop_fake.call_count); \
201177
\
202178
IF_NOT_EMPTY(_stream, ( \
203179
zassert_equal_ptr(_stream, mock_bap_unicast_server_cb_stop_fake.arg0_val, \
@@ -209,8 +185,7 @@ static inline void expect_bt_bap_unicast_server_cb_config_not_called(void)
209185
{
210186
const char *func_name = "bt_bap_unicast_server_cb.config";
211187

212-
zassert_equal(0, mock_bap_unicast_server_cb_config_fake.call_count,
213-
"'%s()' was called unexpectedly", func_name);
188+
zexpect_call_count(func_name, 0, mock_bap_unicast_server_cb_config_fake.call_count);
214189
}
215190

216191
#endif /* MOCKS_BAP_UNICAST_SERVER_EXPECTS_H_ */

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <zephyr/types.h>
1111
#include <zephyr/sys/util_macro.h>
12+
#include <zephyr/ztest.h>
1213

1314
#define CHECK_EMPTY(_x) UTIL_BOOL(IS_EMPTY(_x))
1415
#define COND_CODE_EMPTY(_x, _if_any_code, _else_code) \
@@ -19,6 +20,10 @@
1920
#define expect_data(_func_name, _arg_name, _exp_data, _data, _len) \
2021
IF_NOT_EMPTY(_exp_data, (expect_data_equal(_func_name, _arg_name, _exp_data, _data, _len);))
2122

23+
#define zexpect_call_count(_func_name, _expected, _actual) \
24+
zexpect_equal(_expected, _actual, "'%s()' was called %u times, expected %u times", \
25+
_func_name, _actual, _expected)
26+
2227
static inline void expect_data_equal(const char *func_name, const char *arg_name,
2328
const uint8_t *expect, const uint8_t *data, size_t len)
2429
{

0 commit comments

Comments
 (0)