kernel: begin block device re-architecture work

1 files changed, 9 insertions, 7 deletions

diff --git a/kernel/kapi/filesystem.tests.cpp b/kernel/kapi/filesystem.tests.cpp
index ffd8d7f6..90609a6d 100644
--- a/kernel/kapi/filesystem.tests.cpp
+++ b/kernel/kapi/filesystem.tests.cpp
@@ -13,6 +13,8 @@
 #include <string_view>
 #include <vector>
 
+using namespace kstd::units_literals;
+
 // NOLINTBEGIN (readability-magic-numbers)
 
 SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kapi filesystem with real images",
@@ -36,7 +38,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
       auto bytes_read = kapi::filesystem::read(fd, buffer);
 
       auto buffer_as_str = bytes_read.transform(
-          [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length}; });
+          [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length.value}; });
 
       REQUIRE(buffer_as_str == "info_1");
 
@@ -51,7 +53,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
       auto write_buffer = std::vector<std::byte>{std::byte{'H'}, std::byte{'e'}};
 
       auto const bytes_written = kapi::filesystem::write(*write_fd, write_buffer);
-      REQUIRE(bytes_written == 2);
+      REQUIRE(bytes_written == 2_B);
 
       auto read_fd = kapi::filesystem::open("/information/info_1.txt");
       REQUIRE(read_fd);
@@ -59,7 +61,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
       auto read_buffer = std::vector<std::byte>(6);
       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<char *>(read_buffer.data()), length}; });
+          [&](auto length) { return std::string_view{std::bit_cast<char *>(read_buffer.data()), length.value}; });
 
       REQUIRE(buffer_as_str == "Hefo_1");
 
@@ -74,7 +76,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
       auto buffer = std::vector<std::byte>(6);
       auto bytes_read = kapi::filesystem::read(fd, buffer);
       auto buffer_as_str = bytes_read.transform(
-          [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length}; });
+          [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length.value}; });
 
       REQUIRE(buffer_as_str == "info_1");
 
@@ -88,7 +90,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
       auto buffer = std::vector<std::byte>(6);
       auto bytes_read = kapi::filesystem::read(fd, buffer);
       auto buffer_as_str = bytes_read.transform(
-          [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length}; });
+          [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length.value}; });
 
       REQUIRE(buffer_as_str == "info_1");
 
@@ -104,7 +106,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
       auto buffer = std::vector<std::byte>(7);
       auto bytes_read = kapi::filesystem::read(fd, buffer);
       auto buffer_as_str = bytes_read.transform(
-          [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length}; });
+          [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length.value}; });
 
       REQUIRE(buffer_as_str == "sheep_1");
 
@@ -120,7 +122,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
       auto buffer = std::vector<std::byte>(8);
       auto bytes_read = kapi::filesystem::read(fd, buffer);
       auto buffer_as_str = bytes_read.transform(
-          [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length}; });
+          [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length.value}; });
 
       REQUIRE(buffer_as_str == "monkey_1");