From 85beca6fed7f72859ee8418cd4df8fa0e5b90f7a Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 15 Jul 2026 09:41:42 +0200 Subject: kapi/fs: use spans for byte ranges --- kernel/kapi/filesystem.tests.cpp | 58 ++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 26 deletions(-) (limited to 'kernel/kapi/filesystem.tests.cpp') diff --git a/kernel/kapi/filesystem.tests.cpp b/kernel/kapi/filesystem.tests.cpp index f2a6a988..afd43d97 100644 --- a/kernel/kapi/filesystem.tests.cpp +++ b/kernel/kapi/filesystem.tests.cpp @@ -7,11 +7,14 @@ #include #include +#include #include #include #include #include +// NOLINTBEGIN (readability-magic-numbers) + SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kapi filesystem with real images", "[kapi][filesystem]") { @@ -30,10 +33,11 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap auto fd = kapi::filesystem::open("/information/info_1.txt").value(); auto buffer = std::vector(6); - auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size()); - REQUIRE(bytes_read); + auto bytes_read = kapi::filesystem::read(fd, buffer); + + auto buffer_as_str = bytes_read.transform( + [&](auto length) { return std::string_view{std::bit_cast(buffer.data()), length}; }); - std::string_view buffer_as_str{reinterpret_cast(buffer.data()), static_cast(*bytes_read)}; REQUIRE(buffer_as_str == "info_1"); REQUIRE(kapi::filesystem::close(fd)); @@ -46,17 +50,17 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap auto write_buffer = std::vector{std::byte{'H'}, std::byte{'e'}}; - auto const bytes_written = kapi::filesystem::write(*write_fd, write_buffer.data(), write_buffer.size()); + auto const bytes_written = kapi::filesystem::write(*write_fd, write_buffer); REQUIRE(bytes_written == 2); auto read_fd = kapi::filesystem::open("/information/info_1.txt"); REQUIRE(read_fd); auto read_buffer = std::vector(6); - auto const bytes_read = kapi::filesystem::read(*read_fd, read_buffer.data(), read_buffer.size()); - REQUIRE(bytes_read); + auto const bytes_read = kapi::filesystem::read(*read_fd, read_buffer); + auto buffer_as_str = bytes_read.transform( + [&](auto length) { return std::string_view{std::bit_cast(read_buffer.data()), length}; }); - std::string_view buffer_as_str{reinterpret_cast(read_buffer.data()), static_cast(*bytes_read)}; REQUIRE(buffer_as_str == "Hefo_1"); REQUIRE(kapi::filesystem::close(*write_fd)); @@ -68,10 +72,10 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap auto fd = kapi::filesystem::open("/symlinks/information_directory_absolute/info_1.txt").value(); auto buffer = std::vector(6); - auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size()); - REQUIRE(bytes_read); + auto bytes_read = kapi::filesystem::read(fd, buffer); + auto buffer_as_str = bytes_read.transform( + [&](auto length) { return std::string_view{std::bit_cast(buffer.data()), length}; }); - std::string_view buffer_as_str{reinterpret_cast(buffer.data()), static_cast(*bytes_read)}; REQUIRE(buffer_as_str == "info_1"); REQUIRE(kapi::filesystem::close(fd)); @@ -82,10 +86,10 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap auto fd = kapi::filesystem::open("/symlinks/information_directory_relative/info_1.txt").value(); auto buffer = std::vector(6); - auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size()); - REQUIRE(bytes_read); + auto bytes_read = kapi::filesystem::read(fd, buffer); + auto buffer_as_str = bytes_read.transform( + [&](auto length) { return std::string_view{std::bit_cast(buffer.data()), length}; }); - std::string_view buffer_as_str{reinterpret_cast(buffer.data()), static_cast(*bytes_read)}; REQUIRE(buffer_as_str == "info_1"); REQUIRE(kapi::filesystem::close(fd)); @@ -98,10 +102,10 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap auto fd = kapi::filesystem::open("/information/symlinks/traverse_back_twice/information/sheep_1.txt").value(); auto buffer = std::vector(7); - auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size()); - REQUIRE(bytes_read); + auto bytes_read = kapi::filesystem::read(fd, buffer); + auto buffer_as_str = bytes_read.transform( + [&](auto length) { return std::string_view{std::bit_cast(buffer.data()), length}; }); - std::string_view buffer_as_str{reinterpret_cast(buffer.data()), static_cast(*bytes_read)}; REQUIRE(buffer_as_str == "sheep_1"); REQUIRE(kapi::filesystem::close(fd)); @@ -114,10 +118,10 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap auto fd = kapi::filesystem::open("/information/monkey_house/monkey_1.txt").value(); auto buffer = std::vector(8); - auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size()); - REQUIRE(bytes_read); + auto bytes_read = kapi::filesystem::read(fd, buffer); + auto buffer_as_str = bytes_read.transform( + [&](auto length) { return std::string_view{std::bit_cast(buffer.data()), length}; }); - std::string_view buffer_as_str{reinterpret_cast(buffer.data()), static_cast(*bytes_read)}; REQUIRE(buffer_as_str == "monkey_1"); REQUIRE(kapi::filesystem::close(fd)); @@ -141,7 +145,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap auto fd = kapi::filesystem::open("/dev/ram0").value(); auto buffer = std::vector(512); - auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size()); + auto bytes_read = kapi::filesystem::read(fd, buffer); REQUIRE(bytes_read); REQUIRE(kapi::filesystem::close(fd)); @@ -152,13 +156,13 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap auto read_fd = kapi::filesystem::open("/dev/ram16").value(); auto buffer = std::vector(512, std::byte{0xAB}); - auto bytes_written = kapi::filesystem::write(read_fd, buffer.data(), buffer.size()); + auto bytes_written = kapi::filesystem::write(read_fd, buffer); REQUIRE(bytes_written); auto write_fd = kapi::filesystem::open("/dev/ram16").value(); auto read_buffer = std::vector(512); - auto bytes_read = kapi::filesystem::read(write_fd, read_buffer.data(), read_buffer.size()); + auto bytes_read = kapi::filesystem::read(write_fd, read_buffer); REQUIRE(bytes_read); REQUIRE(std::equal(buffer.begin(), buffer.end(), read_buffer.begin())); @@ -200,7 +204,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap { std::vector buffer(10); auto const invalid_fd = 999uz; - auto bytes_read = kapi::filesystem::read(invalid_fd, buffer.data(), buffer.size()); + auto bytes_read = kapi::filesystem::read(invalid_fd, buffer); REQUIRE(!bytes_read); } @@ -208,7 +212,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap { std::vector buffer(10); auto const invalid_fd = 999uz; - auto bytes_written = kapi::filesystem::write(invalid_fd, buffer.data(), buffer.size()); + auto bytes_written = kapi::filesystem::write(invalid_fd, buffer); REQUIRE(!bytes_written); } @@ -224,7 +228,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap REQUIRE(fd); auto write_buffer = std::vector{std::byte{'T'}, std::byte{'e'}, std::byte{'s'}, std::byte{'t'}}; - CHECK(kapi::filesystem::write(*fd, write_buffer.data(), write_buffer.size())); + CHECK(kapi::filesystem::write(*fd, write_buffer)); REQUIRE(kapi::filesystem::close(*fd)); @@ -232,7 +236,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap REQUIRE(fd); auto read_buffer = std::vector(4); - auto bytes_read = kapi::filesystem::read(*fd, read_buffer.data(), read_buffer.size()); + auto bytes_read = kapi::filesystem::read(*fd, read_buffer); std::string_view buffer_as_str{reinterpret_cast(read_buffer.data()), static_cast(*bytes_read)}; REQUIRE(buffer_as_str == "Test"); @@ -271,3 +275,5 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap } } } + +// NOLINTEND (readability-magic-numbers) \ No newline at end of file -- cgit v1.2.3