Skip to content

Commit 07a729b

Browse files
nordic-krchkartben
nordic-krch
authored and
kartben
committed
tests: fs: Fix zassert strings
After introducing compile time argument validation of strings used in zassert macros multiple warnings appear. Fix all of them. Signed-off-by: Krzysztof Chruściński <[email protected]>
1 parent 6deca93 commit 07a729b

File tree

7 files changed

+41
-46
lines changed

7 files changed

+41
-46
lines changed

‎tests/subsys/fs/common/test_fs_mount_flags.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,53 +25,53 @@ void test_fs_mount_flags(void)
2525
mp->flags |= FS_MOUNT_FLAG_NO_FORMAT;
2626
ret = fs_mount(mp);
2727
TC_PRINT("Mount unformatted with FS_MOUNT_FLAG_NO_FORMAT set\n");
28-
zassert_false(ret == 0, "Expected failure", ret);
28+
zassert_false(ret == 0, "Expected failure got %d", ret);
2929

3030
/* Test FS_MOUNT_FLAG_READ_ONLY on non-formatted volume*/
3131
mp->flags = FS_MOUNT_FLAG_READ_ONLY;
3232
ret = fs_mount(mp);
3333
TC_PRINT("Mount unformatted with FS_MOUNT_FLAG_READ_ONLY set\n");
34-
zassert_false(ret == 0, "Expected failure", ret);
34+
zassert_false(ret == 0, "Expected failure got %d", ret);
3535

3636
/* Format volume and add some files/dirs to check read-only flag */
3737
mp->flags = 0;
3838
ret = fs_mount(mp);
3939
TC_PRINT("Mount again to format volume\n");
40-
zassert_equal(ret, 0, "Expected success", ret);
40+
zassert_equal(ret, 0, "Expected success got %d", ret);
4141
TC_PRINT("Create some file\n");
4242
ret = fs_open(&fs, "/sml/some", FS_O_CREATE);
43-
zassert_equal(ret, 0, "Expected success", ret);
43+
zassert_equal(ret, 0, "Expected success got %d", ret);
4444
fs_close(&fs);
4545
TC_PRINT("Create other directory\n");
4646
ret = fs_mkdir("/sml/other");
47-
zassert_equal(ret, 0, "Expected success", ret);
47+
zassert_equal(ret, 0, "Expected success got %d", ret);
4848

4949
ret = fs_unmount(mp);
50-
zassert_equal(ret, 0, "Expected success", ret);
50+
zassert_equal(ret, 0, "Expected success got %d", ret);
5151

5252
/* Check fs operation on volume mounted with FS_MOUNT_FLAG_READ_ONLY */
5353
mp->flags = FS_MOUNT_FLAG_READ_ONLY;
5454
TC_PRINT("Mount as read-only\n");
5555
ret = fs_mount(mp);
56-
zassert_equal(ret, 0, "Expected success", ret);
56+
zassert_equal(ret, 0, "Expected success got %d", ret);
5757

5858
/* Attempt creating new file */
5959
ret = fs_open(&fs, "/sml/nosome", FS_O_CREATE);
60-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
60+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
6161
ret = fs_mkdir("/sml/another");
62-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
62+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
6363
ret = fs_rename("/sml/some", "/sml/nosome");
64-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
64+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
6565
ret = fs_unlink("/sml/some");
66-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
66+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
6767
ret = fs_open(&fs, "/sml/other", FS_O_CREATE);
68-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
68+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
6969
ret = fs_open(&fs, "/sml/some", FS_O_RDWR);
70-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
70+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
7171
ret = fs_open(&fs, "/sml/some", FS_O_READ);
72-
zassert_equal(ret, 0, "Expected success", ret);
72+
zassert_equal(ret, 0, "Expected success got %d", ret);
7373
fs_close(&fs);
7474

7575
ret = fs_unmount(mp);
76-
zassert_equal(ret, 0, "Expected success", ret);
76+
zassert_equal(ret, 0, "Expected success got %d", ret);
7777
}

‎tests/subsys/fs/ext2/src/testfs_ext_specific.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ uint32_t calculate_blocks(uint32_t freeb, uint32_t B)
4141

4242
static void write_to_file(const char *file_path, uint32_t bytes_to_write)
4343
{
44-
int64_t ret = 0;
44+
int ret = 0;
4545
struct fs_file_t file;
4646
struct fs_dirent entry;
4747

@@ -50,7 +50,7 @@ static void write_to_file(const char *file_path, uint32_t bytes_to_write)
5050
zassert_equal(ret, 0, "File open failed (ret=%d)", ret);
5151

5252
ret = testfs_write_incrementing(&file, 0, bytes_to_write);
53-
zassert_equal(ret, bytes_to_write, "Different number of bytes written %ld (expected %ld)",
53+
zassert_equal(ret, bytes_to_write, "Different number of bytes written %d (expected %d)",
5454
ret, bytes_to_write);
5555

5656
ret = fs_close(&file);
@@ -70,7 +70,7 @@ static void write_to_file(const char *file_path, uint32_t bytes_to_write)
7070

7171

7272
ret = testfs_verify_incrementing(&file, 0, bytes_to_write);
73-
zassert_equal(ret, bytes_to_write, "Different number of bytes read %ld (expected %ld)",
73+
zassert_equal(ret, bytes_to_write, "Different number of bytes read %d (expected %d)",
7474
ret, bytes_to_write);
7575

7676
ret = fs_close(&file);
@@ -79,7 +79,7 @@ static void write_to_file(const char *file_path, uint32_t bytes_to_write)
7979

8080
static void truncate_file(const char *file_path, uint32_t new_size)
8181
{
82-
int64_t ret = 0;
82+
int ret = 0;
8383
struct fs_file_t file;
8484
struct fs_dirent entry;
8585

@@ -102,7 +102,7 @@ static void truncate_file(const char *file_path, uint32_t new_size)
102102
zassert_equal(ret, 0, "File seek failed (ret=%d)", ret);
103103

104104
ret = testfs_verify_incrementing(&file, 0, new_size);
105-
zassert_equal(ret, new_size, "Different number of bytes read %ld (expected %ld)",
105+
zassert_equal(ret, new_size, "Different number of bytes read %d (expected %d)",
106106
ret, new_size);
107107

108108
ret = fs_close(&file);
@@ -111,7 +111,7 @@ static void truncate_file(const char *file_path, uint32_t new_size)
111111

112112
void writing_test(struct ext2_cfg *config)
113113
{
114-
int64_t ret = 0;
114+
int ret = 0;
115115
struct fs_statvfs sbuf;
116116
struct fs_mount_t *mp = &testfs_mnt;
117117
static const char *file_path = "/sml/file";
@@ -151,7 +151,7 @@ void writing_test(struct ext2_cfg *config)
151151

152152
ZTEST(ext2tests, test_indirect_block_removal)
153153
{
154-
int64_t ret = 0;
154+
int ret = 0;
155155
struct fs_statvfs sbuf;
156156
struct fs_mount_t *mp = &testfs_mnt;
157157
static const char *file_path = "/sml/file";

‎tests/subsys/fs/ext2/src/testfs_mount.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ ZTEST(ext2tests, test_statvfs)
6464
sbuf.f_bsize, sbuf.f_frsize, sbuf.f_blocks, sbuf.f_bfree);
6565

6666
zassert_equal(sbuf.f_bsize, 1024,
67-
"Wrong block size %lu (expected %lu)", sbuf.f_bsize, 1024);
67+
"Wrong block size %lu (expected %d)", sbuf.f_bsize, 1024);
6868
zassert_equal(sbuf.f_frsize, 1024,
69-
"Wrong frag size %lu (expected %lu)", sbuf.f_frsize, 1024);
69+
"Wrong frag size %lu (expected %d)", sbuf.f_frsize, 1024);
7070
zassert_equal(sbuf.f_blocks, partition_size / 1024,
71-
"Wrong block count %lu (expected %lu)",
71+
"Wrong block count %lu (expected %zu)",
7272
sbuf.f_blocks, partition_size / 1024);
7373

7474
ret = fs_unmount(mp);
@@ -115,11 +115,11 @@ void mkfs_custom_config(struct ext2_cfg *cfg)
115115
sbuf.f_bsize, sbuf.f_frsize, sbuf.f_blocks, sbuf.f_bfree);
116116

117117
zassert_equal(sbuf.f_bsize, cfg->block_size,
118-
"Wrong block size %lu (expected %lu)", sbuf.f_bsize, cfg->block_size);
118+
"Wrong block size %lu (expected %zu)", sbuf.f_bsize, cfg->block_size);
119119
zassert_equal(sbuf.f_frsize, cfg->block_size,
120-
"Wrong frag size %lu (expected %lu)", sbuf.f_frsize, cfg->block_size);
120+
"Wrong frag size %lu (expected %zu)", sbuf.f_frsize, cfg->block_size);
121121
zassert_equal(sbuf.f_blocks, partition_size / cfg->block_size,
122-
"Wrong block count %lu (expected %lu)",
122+
"Wrong block count %lu (expected %zu)",
123123
sbuf.f_blocks, partition_size / cfg->block_size);
124124

125125
ret = fs_unmount(mp);

‎tests/subsys/fs/fat_fs_api/src/test_fat_rd_only_mount.c‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ static void test_prepare(void)
2020

2121
fs_file_t_init(&fs);
2222
zassert_equal(fs_mount(&fatfs_mnt), 0);
23-
zassert_equal(fs_open(&fs, FATFS_MNTP"/testfile.txt", FS_O_CREATE),
24-
0, NULL);
23+
zassert_equal(fs_open(&fs, FATFS_MNTP"/testfile.txt", FS_O_CREATE), 0);
2524
zassert_equal(fs_close(&fs), 0);
2625
zassert_equal(fs_unmount(&fatfs_mnt), 0);
2726
}
@@ -41,21 +40,21 @@ static void test_ops_on_rd(void)
4140
fatfs_mnt.flags = FS_MOUNT_FLAG_READ_ONLY;
4241
TC_PRINT("Mount as read-only\n");
4342
ret = fs_mount(&fatfs_mnt);
44-
zassert_equal(ret, 0, "Expected success", ret);
43+
zassert_equal(ret, 0, "Expected success got %d", ret);
4544

4645
/* Attempt creating new file */
4746
ret = fs_open(&fs, FATFS_MNTP"/nosome", FS_O_CREATE);
48-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
47+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
4948
ret = fs_mkdir(FATFS_MNTP"/another");
50-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
49+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
5150
ret = fs_rename(FATFS_MNTP"/testfile.txt", FATFS_MNTP"/bestfile.txt");
52-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
51+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
5352
ret = fs_unlink(FATFS_MNTP"/testfile.txt");
54-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
53+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
5554
ret = fs_open(&fs, FATFS_MNTP"/testfile.txt", FS_O_RDWR);
56-
zassert_equal(ret, -EROFS, "Expected EROFS", ret);
55+
zassert_equal(ret, -EROFS, "Expected EROFS got %d", ret);
5756
ret = fs_open(&fs, FATFS_MNTP"/testfile.txt", FS_O_READ);
58-
zassert_equal(ret, 0, "Expected success", ret);
57+
zassert_equal(ret, 0, "Expected success got %d", ret);
5958
fs_close(&fs);
6059
}
6160

‎tests/subsys/fs/multi-fs/src/test_fat_file.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@ static const char *test_str = "Hello world FAT";
1515
void test_fat_open(void)
1616
{
1717
fs_file_t_init(&test_file);
18-
zassert_true(test_file_open(&test_file, TEST_FILE_PATH) == TC_PASS,
19-
NULL);
18+
zassert_true(test_file_open(&test_file, TEST_FILE_PATH) == TC_PASS);
2019
}
2120

2221
void test_fat_write(void)
2322
{
2423
TC_PRINT("Write to file %s\n", TEST_FILE_PATH);
25-
zassert_true(test_file_write(&test_file, test_str) == TC_PASS,
26-
NULL);
24+
zassert_true(test_file_write(&test_file, test_str) == TC_PASS);
2725
}
2826

2927
void test_fat_read(void)

‎tests/subsys/fs/multi-fs/src/test_fs_shell.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ static void test_shell_exec(const char *line, int result)
2323

2424
TC_PRINT("shell_execute_cmd(%s): %d\n", line, ret);
2525

26-
zassert_true(ret == result, line);
26+
zassert_true(ret == result, "%s", line);
2727
}
2828

2929
ZTEST(multi_fs_help, test_fs_help)

‎tests/subsys/fs/multi-fs/src/test_littlefs_file.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@ static const char *test_str = "Hello world LITTLEFS";
1515
void test_littlefs_open(void)
1616
{
1717
fs_file_t_init(&test_file);
18-
zassert_true(test_file_open(&test_file, TEST_FILE_PATH) == TC_PASS,
19-
NULL);
18+
zassert_true(test_file_open(&test_file, TEST_FILE_PATH) == TC_PASS);
2019
}
2120

2221
void test_littlefs_write(void)
2322
{
2423
TC_PRINT("Write to file %s\n", TEST_FILE_PATH);
25-
zassert_true(test_file_write(&test_file, test_str) == TC_PASS,
26-
NULL);
24+
zassert_true(test_file_write(&test_file, test_str) == TC_PASS);
2725
}
2826

2927
void test_littlefs_read(void)

0 commit comments

Comments
 (0)