Skip to content

Commit 96e2f8b

Browse files
nordic-krchkartben
nordic-krch
authored and
kartben
committed
tests: lib: Fix zassert string
Fix wrong parameter used in zassert macros. Signed-off-by: Krzysztof Chruściński <[email protected]>
1 parent 6ea6e57 commit 96e2f8b

File tree

17 files changed

+85
-100
lines changed

17 files changed

+85
-100
lines changed

‎tests/kernel/interrupt/src/sw_isr_table.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ZTEST(interrupt_feature, test_sw_isr_irq_parent_table_idx)
4141
l2_isr_offset + local_irq + (i * CONFIG_MAX_IRQ_PER_AGGREGATOR);
4242

4343
zassert_equal(isr_offset, test_isr_offset,
44-
"%d: expected offset: %d, got: %d", i,
44+
"%zu: expected offset: %d, got: %d", i,
4545
isr_offset, test_isr_offset);
4646
}
4747
}
@@ -78,12 +78,12 @@ ZTEST(interrupt_feature, test_sw_isr_irq_parent_table_dev)
7878
local_irq < CONFIG_MAX_IRQ_PER_AGGREGATOR; local_irq++) {
7979
test_irq = irq_to_level_2(local_irq) | parent_irq[i];
8080
test_dev = z_get_sw_isr_device_from_irq(test_irq);
81-
zassert_equal_ptr(parent_dev[i], test_dev, "%d: expected dev: %p, got: %p",
81+
zassert_equal_ptr(parent_dev[i], test_dev, "%zu: expected dev: %p, got: %p",
8282
i, parent_dev[i], test_dev);
8383
}
8484

8585
test_irq = z_get_sw_isr_irq_from_device(parent_dev[i]);
86-
zassert_equal(parent_irq[i], test_irq, "%d: expected offset: %d, got: %d", i,
86+
zassert_equal(parent_irq[i], test_irq, "%zu: expected offset: %d, got: %d", i,
8787
parent_irq[i], test_irq);
8888
}
8989
}

‎tests/lib/c_lib/common/src/main.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ ZTEST(libc_common, test_strncmp)
256256
/* test compare the same strings */
257257
buffer[BUFSIZE - 1] = '\0';
258258
zassert_true((strncmp(buffer, buffer, BUFSIZE) == 0),
259-
"strncmp 10 with \0");
259+
"strncmp 10 with \\0");
260260
}
261261

262262

@@ -538,7 +538,7 @@ ZTEST(libc_common, test_memchr)
538538

539539
/* verify the character inside the count scope */
540540
zassert_not_null(memchr(str, 'e', strlen(str)), "memchr serach e");
541-
zassert_not_null(memchr(str, '\0', strlen(str)+1), "memchr serach \0");
541+
zassert_not_null(memchr(str, '\0', strlen(str)+1), "memchr serach \\0");
542542

543543
/* verify when the count parm is zero */
544544
zassert_is_null(memchr(str, 't', 0), "memchr count 0 error");
@@ -658,7 +658,7 @@ ZTEST(libc_common, test_str_operate)
658658
zassert_is_null(strstr(str1, "ayz"), "strstr aabbccd with ayz failed");
659659
zassert_not_null(strstr(str1, str2), "strstr aabbccd with b succeed");
660660
zassert_not_null(strstr(str1, "bb"), "strstr aabbccd with bb succeed");
661-
zassert_not_null(strstr(str1, ""), "strstr aabbccd with \0 failed");
661+
zassert_not_null(strstr(str1, ""), "strstr aabbccd with \\0 failed");
662662
}
663663

664664
/**
@@ -909,7 +909,7 @@ void test_strtoll(void)
909909
ret = strtoll(border4, NULL, 10);
910910
zassert_equal(ret, LLONG_MAX, "strtoll base = 10 failed");
911911
ret = strtoull(border5, NULL, 16);
912-
zassert_equal(ret, 1, "strtoull base = 16 failed, %s != 0x%x", border5, ret);
912+
zassert_equal(ret, 1, "strtoull base = 16 failed, %s != 0x%llx", border5, ret);
913913
ret = strtoull(border6, NULL, 10);
914914
zassert_equal(errno, ERANGE, "strtoull base = 10 failed, %s != %lld", border6, ret);
915915
ret = strtoull(border7, NULL, 10);
@@ -987,7 +987,7 @@ void test_strtoull(void)
987987
ret = strtoull(border3, NULL, 10);
988988
zassert_equal(ret, ULLONG_MAX, "strtoull base = 10 failed");
989989
ret = strtoull(border4, NULL, 16);
990-
zassert_equal(ret, 1, "strtoull base = 16 failed, %s != 0x%x", border4, ret);
990+
zassert_equal(ret, 1, "strtoull base = 16 failed, %s != 0x%llx", border4, ret);
991991
ret = strtoull(border5, NULL, 10);
992992
zassert_equal(errno, ERANGE, "strtoull base = 10 failed, %s != %lld", border5, ret);
993993
ret = strtoull(border6, NULL, 10);

‎tests/lib/cobs/src/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ static void *cobs_test_setup(void)
2222
{
2323
struct cobs_tests_fixture *fixture = malloc(sizeof(struct cobs_tests_fixture));
2424

25-
zassume_not_null(fixture, NULL);
25+
zassume_not_null(fixture);
2626

2727
fixture->test_data = net_buf_alloc(&test_pool, K_NO_WAIT);
2828
fixture->encoded = net_buf_alloc(&test_pool, K_NO_WAIT);

‎tests/lib/devicetree/api/src/main.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -544,10 +544,8 @@ ZTEST(devicetree_api, test_bus)
544544
zassert_equal(DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(vnd_i2c_device, i2c), 1);
545545
zassert_equal(DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(vnd_i2c_device, spi), 0);
546546

547-
zassert_equal(DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(vnd_gpio_expander, i2c), 1,
548-
NULL);
549-
zassert_equal(DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(vnd_gpio_expander, spi), 1,
550-
NULL);
547+
zassert_equal(DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(vnd_gpio_expander, i2c), 1);
548+
zassert_equal(DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(vnd_gpio_expander, spi), 1);
551549
}
552550

553551
#undef DT_DRV_COMPAT
@@ -768,7 +766,7 @@ ZTEST(devicetree_api, test_irq)
768766
/* DT_IRQ_HAS_CELL_AT_IDX */
769767
zassert_true(DT_IRQ_HAS_CELL_AT_IDX(TEST_IRQ, 0, irq), "");
770768
zassert_true(DT_IRQ_HAS_CELL_AT_IDX(TEST_IRQ, 0, priority), "");
771-
zassert_false(DT_IRQ_HAS_CELL_AT_IDX(TEST_IRQ, 0, foo), 0, "");
769+
zassert_false(DT_IRQ_HAS_CELL_AT_IDX(TEST_IRQ, 0, foo), "");
772770
zassert_true(DT_IRQ_HAS_CELL_AT_IDX(TEST_IRQ, 2, irq), "");
773771
zassert_true(DT_IRQ_HAS_CELL_AT_IDX(TEST_IRQ, 2, priority), "");
774772
zassert_false(DT_IRQ_HAS_CELL_AT_IDX(TEST_IRQ, 2, foo), "");

‎tests/lib/devicetree/devices/src/main.c‎

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -71,29 +71,29 @@ ZTEST(devicetree_devices, test_init_get)
7171
{
7272
/* Check device pointers */
7373
zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO)->dev,
74-
DEVICE_DT_GET(TEST_GPIO), NULL);
74+
DEVICE_DT_GET(TEST_GPIO));
7575
zassert_equal(DEVICE_INIT_DT_GET(TEST_I2C)->dev,
76-
DEVICE_DT_GET(TEST_I2C), NULL);
76+
DEVICE_DT_GET(TEST_I2C));
7777
zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVA)->dev,
78-
DEVICE_DT_GET(TEST_DEVA), NULL);
78+
DEVICE_DT_GET(TEST_DEVA));
7979
zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVB)->dev,
80-
DEVICE_DT_GET(TEST_DEVB), NULL);
80+
DEVICE_DT_GET(TEST_DEVB));
8181
zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIOX)->dev,
82-
DEVICE_DT_GET(TEST_GPIOX), NULL);
82+
DEVICE_DT_GET(TEST_GPIOX));
8383
zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVC)->dev,
84-
DEVICE_DT_GET(TEST_DEVC), NULL);
84+
DEVICE_DT_GET(TEST_DEVC));
8585
zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION_OUTER)->dev,
86-
DEVICE_DT_GET(TEST_PARTITION_OUTER), NULL);
86+
DEVICE_DT_GET(TEST_PARTITION_OUTER));
8787
zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION0)->dev,
88-
DEVICE_DT_GET(TEST_PARTITION0), NULL);
88+
DEVICE_DT_GET(TEST_PARTITION0));
8989
zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION1)->dev,
90-
DEVICE_DT_GET(TEST_PARTITION1), NULL);
90+
DEVICE_DT_GET(TEST_PARTITION1));
9191
zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO_INJECTED)->dev,
92-
DEVICE_DT_GET(TEST_GPIO_INJECTED), NULL);
92+
DEVICE_DT_GET(TEST_GPIO_INJECTED));
9393
zassert_equal(DEVICE_INIT_GET(manual_dev)->dev,
94-
DEVICE_GET(manual_dev), NULL);
94+
DEVICE_GET(manual_dev));
9595
zassert_equal(DEVICE_INIT_DT_GET(TEST_NOLABEL)->dev,
96-
DEVICE_DT_GET(TEST_NOLABEL), NULL);
96+
DEVICE_DT_GET(TEST_NOLABEL));
9797

9898
/* Check init functions */
9999
zassert_equal(DEVICE_DT_GET(TEST_GPIO)->ops.init, dev_init);
@@ -177,24 +177,21 @@ ZTEST(devicetree_devices, test_requires)
177177
zassert_equal(dev, DEVICE_DT_GET(TEST_GPIO));
178178
hdls = device_required_handles_get(dev, &nhdls);
179179
zassert_equal(nhdls, 0);
180-
zassert_equal(0, device_required_foreach(dev, device_visitor, &ctx),
181-
NULL);
180+
zassert_equal(0, device_required_foreach(dev, device_visitor, &ctx));
182181

183182
/* TEST_GPIO_INJECTED: no req */
184183
dev = device_get_binding(DEVICE_DT_NAME(TEST_GPIO_INJECTED));
185184
zassert_equal(dev, DEVICE_DT_GET(TEST_GPIO_INJECTED));
186185
hdls = device_required_handles_get(dev, &nhdls);
187186
zassert_equal(nhdls, 0);
188-
zassert_equal(0, device_required_foreach(dev, device_visitor, &ctx),
189-
NULL);
187+
zassert_equal(0, device_required_foreach(dev, device_visitor, &ctx));
190188

191189
/* TEST_I2C: no req */
192190
dev = device_get_binding(DEVICE_DT_NAME(TEST_I2C));
193191
zassert_equal(dev, DEVICE_DT_GET(TEST_I2C));
194192
hdls = device_required_handles_get(dev, &nhdls);
195193
zassert_equal(nhdls, 0);
196-
zassert_equal(0, device_required_foreach(dev, device_visitor, &ctx),
197-
NULL);
194+
zassert_equal(0, device_required_foreach(dev, device_visitor, &ctx));
198195

199196
/* TEST_DEVA: TEST_I2C GPIO */
200197
dev = device_get_binding(DEVICE_DT_NAME(TEST_DEVA));
@@ -208,21 +205,17 @@ ZTEST(devicetree_devices, test_requires)
208205
ctx = (struct visitor_context){
209206
.ndevs = 1,
210207
};
211-
zassert_equal(-ENOSPC, device_required_foreach(dev, device_visitor, &ctx),
212-
NULL);
208+
zassert_equal(-ENOSPC, device_required_foreach(dev, device_visitor, &ctx));
213209

214210
/* Visit succeeds if enough space. */
215211
ctx = (struct visitor_context){
216212
.ndevs = 2,
217213
};
218-
zassert_equal(2, device_required_foreach(dev, device_visitor, &ctx),
219-
NULL);
214+
zassert_equal(2, device_required_foreach(dev, device_visitor, &ctx));
220215
zassert_true((ctx.rdevs[0] == device_from_handle(DEV_HDL(TEST_I2C)))
221-
|| (ctx.rdevs[1] == device_from_handle(DEV_HDL(TEST_I2C))),
222-
NULL);
216+
|| (ctx.rdevs[1] == device_from_handle(DEV_HDL(TEST_I2C))));
223217
zassert_true((ctx.rdevs[0] == device_from_handle(DEV_HDL(TEST_GPIO)))
224-
|| (ctx.rdevs[1] == device_from_handle(DEV_HDL(TEST_GPIO))),
225-
NULL);
218+
|| (ctx.rdevs[1] == device_from_handle(DEV_HDL(TEST_GPIO))));
226219

227220
/* TEST_GPIOX: TEST_I2C */
228221
dev = device_get_binding(DEVICE_DT_NAME(TEST_GPIOX));
@@ -233,10 +226,8 @@ ZTEST(devicetree_devices, test_requires)
233226
ctx = (struct visitor_context){
234227
.ndevs = 3,
235228
};
236-
zassert_equal(1, device_required_foreach(dev, device_visitor, &ctx),
237-
NULL);
238-
zassert_true(ctx.rdevs[0] == device_from_handle(DEV_HDL(TEST_I2C)),
239-
NULL);
229+
zassert_equal(1, device_required_foreach(dev, device_visitor, &ctx));
230+
zassert_true(ctx.rdevs[0] == device_from_handle(DEV_HDL(TEST_I2C)));
240231

241232
/* TEST_DEVB: TEST_I2C TEST_GPIOX */
242233
dev = device_get_binding(DEVICE_DT_NAME(TEST_DEVB));
@@ -281,7 +272,7 @@ ZTEST(devicetree_devices, test_get_or_null)
281272
const struct device *dev;
282273

283274
dev = DEVICE_DT_GET_OR_NULL(TEST_DEVA);
284-
zassert_not_equal(dev, NULL, NULL);
275+
zassert_not_equal(dev, NULL);
285276

286277
dev = DEVICE_DT_GET_OR_NULL(non_existing_node);
287278
zassert_is_null(dev);

‎tests/lib/heap/src/main.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void *testalloc(void *arg, size_t bytes)
130130
size_t expect = ROUND_UP(bytes + hdr, 8) - hdr;
131131

132132
zassert_equal(blksz, expect,
133-
"wrong size block returned bytes = %ld ret = %ld",
133+
"wrong size block returned bytes = %zu ret = %zu",
134134
bytes, blksz);
135135
}
136136

@@ -441,7 +441,7 @@ ZTEST(lib_heap, test_heap_listeners)
441441

442442
zassert_equal(listener_heap_id,
443443
HEAP_ID_FROM_POINTER(&listener_heap),
444-
"Heap ID mismatched: 0x%lx != %p", listener_heap_id,
444+
"Heap ID mismatched: %p != %p", (void *)listener_heap_id,
445445
&listener_heap);
446446
zassert_equal(listener_mem, mem,
447447
"Heap allocated pointer mismatched: %p != %p",
@@ -450,7 +450,7 @@ ZTEST(lib_heap, test_heap_listeners)
450450
sys_heap_free(&listener_heap, mem);
451451
zassert_equal(listener_heap_id,
452452
HEAP_ID_FROM_POINTER(&listener_heap),
453-
"Heap ID mismatched: 0x%lx != %p", listener_heap_id,
453+
"Heap ID mismatched: %p != %p", (void *)listener_heap_id,
454454
&listener_heap);
455455
zassert_equal(listener_mem, mem,
456456
"Heap allocated pointer mismatched: %p != %p",
@@ -461,7 +461,7 @@ ZTEST(lib_heap, test_heap_listeners)
461461

462462
zassert_equal(listener_heap_id,
463463
HEAP_ID_FROM_POINTER(&listener_heap),
464-
"Heap ID mismatched: 0x%lx != %p", listener_heap_id,
464+
"Heap ID mismatched: %p != %p", (void *)listener_heap_id,
465465
&listener_heap);
466466
zassert_equal(listener_mem, mem,
467467
"Heap allocated pointer mismatched: %p != %p",
@@ -470,7 +470,7 @@ ZTEST(lib_heap, test_heap_listeners)
470470
sys_heap_free(&listener_heap, mem);
471471
zassert_equal(listener_heap_id,
472472
HEAP_ID_FROM_POINTER(&listener_heap),
473-
"Heap ID mismatched: 0x%lx != %p", listener_heap_id,
473+
"Heap ID mismatched: %p != %p", (void *)listener_heap_id,
474474
&listener_heap);
475475
zassert_equal(listener_mem, mem,
476476
"Heap allocated pointer mismatched: %p != %p",

‎tests/lib/json/src/main.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,7 @@ ZTEST(lib_json_test, test_large_descriptor)
20392039
int64_t ret = json_obj_parse(encoded, sizeof(encoded) - 1, large_descr,
20402040
ARRAY_SIZE(large_descr), &ls);
20412041

2042-
zassert_false(ret < 0, "json_obj_parse returned error %d", ret);
2042+
zassert_false(ret < 0, "json_obj_parse returned error %lld", ret);
20432043
zassert_false(ret & ((int64_t)1 << 2), "Field int2 erroneously decoded");
20442044
zassert_false(ret & ((int64_t)1 << 35), "Field int35 erroneously decoded");
20452045
zassert_true(ret & ((int64_t)1 << 1), "Field int1 not decoded");
@@ -2084,7 +2084,7 @@ ZTEST(lib_json_test, test_json_array_alignment)
20842084
int64_t ret = json_obj_parse(encoded, sizeof(encoded) - 1, outer_descr,
20852085
ARRAY_SIZE(outer_descr), &o);
20862086

2087-
zassert_false(ret < 0, "json_obj_parse returned error %d", ret);
2087+
zassert_false(ret < 0, "json_obj_parse returned error %lld", ret);
20882088
zassert_equal(o.num_elements, 2, "Number of elements not decoded correctly");
20892089

20902090
zassert_equal(o.array[0].int1, 1, "Element 0 int1 not decoded correctly");
@@ -2107,7 +2107,7 @@ ZTEST(lib_json_test, test_json_array_alignment_bool)
21072107
int64_t ret = json_obj_parse(encoded, sizeof(encoded) - 1, alignment_bool_descr,
21082108
ARRAY_SIZE(alignment_bool_descr), &o);
21092109

2110-
zassert_false(ret < 0, "json_obj_parse returned error %d", ret);
2110+
zassert_false(ret < 0, "json_obj_parse returned error %lld", ret);
21112111
zassert_equal(o.num_elements, 2, "Number of elements not decoded correctly");
21122112

21132113
zassert_equal(o.array[0].bool1, true, "Element 0 bool1 not decoded correctly");

‎tests/lib/lockfree/src/test_mpsc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ZTEST(mpsc, test_push_pop)
4848

4949
zassert_equal(head, &push_pop_nodes[0], "Queue head should point at push_pop_node");
5050
next = mpsc_ptr_get(push_pop_nodes[0].next);
51-
zassert_is_null(next, NULL, "push_pop_node next should point at null");
51+
zassert_is_null(next, "push_pop_node next should point at null");
5252
next = mpsc_ptr_get(push_pop_q.stub.next);
5353
zassert_equal(next, &push_pop_nodes[0], "Queue stub should point at push_pop_node");
5454
tail = push_pop_q.tail;

‎tests/lib/mem_alloc/src/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ ZTEST(c_lib_dynamic_memalloc, test_reallocarray)
292292

293293
cptr = reallocarray(ptr, TOO_BIG, sizeof(int));
294294
zassert_is_null((ptr), "reallocarray failed, errno: %d", errno);
295-
zassert_is_null((cptr), "reallocarray failed, errno: %d");
295+
zassert_is_null((cptr), "reallocarray failed, errno: %d", errno);
296296
free(cptr);
297297

298298
ptr = malloc(orig_size);

‎tests/lib/mem_blocks/src/main.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,16 @@ static void alloc_free(sys_mem_blocks_t *mem_block,
151151
#ifdef CONFIG_SYS_MEM_BLOCKS_LISTENER
152152
zassert_equal(listener_heap_id[i],
153153
HEAP_ID_FROM_POINTER(mem_block),
154-
"Heap ID mismatched: 0x%lx != %p",
155-
listener_heap_id[i], mem_block);
154+
"Heap ID mismatched: %p != %p",
155+
(void *)listener_heap_id[i], mem_block);
156156
zassert_equal(listener_mem[i], blocks[i][0],
157157
"Heap allocated pointer mismatched: %p != %p",
158158
listener_mem[i], blocks[i][0]);
159159
zassert_equal(listener_size[i],
160160
BIT(mem_block->info.blk_sz_shift),
161161
"Heap allocated sized: %u != %u",
162162
listener_size[i],
163-
BIT(mem_block->info.blk_sz_shift));
163+
(uint32_t)BIT(mem_block->info.blk_sz_shift));
164164
#endif
165165
}
166166

@@ -188,16 +188,16 @@ static void alloc_free(sys_mem_blocks_t *mem_block,
188188
#ifdef CONFIG_SYS_MEM_BLOCKS_LISTENER
189189
zassert_equal(listener_heap_id[i],
190190
HEAP_ID_FROM_POINTER(mem_block),
191-
"Heap ID mismatched: 0x%lx != %p",
192-
listener_heap_id[i], mem_block);
191+
"Heap ID mismatched: 0x%p != %p",
192+
(void *)listener_heap_id[i], mem_block);
193193
zassert_equal(listener_mem[i], blocks[i][0],
194194
"Heap allocated pointer mismatched: %p != %p",
195195
listener_mem[i], blocks[i][0]);
196196
zassert_equal(listener_size[i],
197197
BIT(mem_block->info.blk_sz_shift),
198198
"Heap allocated sized: %u != %u",
199199
listener_size[i],
200-
BIT(mem_block->info.blk_sz_shift));
200+
(uint32_t)BIT(mem_block->info.blk_sz_shift));
201201
#endif
202202
}
203203
}

0 commit comments

Comments
 (0)