add vfs tests with real ext2 images

5 files changed, 119 insertions, 12 deletions

diff --git a/kernel/src/test_support/filesystem/storage_boot_module_fixture.cpp b/kernel/src/test_support/filesystem/storage_boot_module_fixture.cpp
index 8bbf194..a139f63 100644
--- a/kernel/src/test_support/filesystem/storage_boot_module_fixture.cpp
+++ b/kernel/src/test_support/filesystem/storage_boot_module_fixture.cpp
@@ -8,36 +8,102 @@
 #include "kernel/test_support/boot_modules.hpp"
 #include "kernel/test_support/devices/storage/management.hpp"
 
+#include <kstd/string>
+#include <kstd/vector>
+
 #include <cstddef>
-#include <string>
+#include <filesystem>
+#include <fstream>
+#include <ios>
+#include <stdexcept>
 
 namespace kernel::tests::filesystem
 {
-  auto storage_boot_module_fixture::setup_modules(std::size_t module_count, std::size_t module_size) -> void
+  storage_boot_module_fixture::~storage_boot_module_fixture()
   {
     kernel::tests::devices::storage::management::deinit();
     kernel::tests::boot_modules::deinit();
+  }
 
-    module_names.clear();
-    module_data.clear();
-    registry = {};
+  auto storage_boot_module_fixture::setup_modules(std::size_t module_count, std::size_t module_size) -> void
+  {
+    m_module_names.clear();
+    m_module_data.clear();
+    m_registry = {};
 
-    module_names.reserve(module_count);
-    module_data.reserve(module_count);
+    m_module_names.reserve(module_count);
+    m_module_data.reserve(module_count);
 
     for (std::size_t i = 0; i < module_count; ++i)
     {
-      module_names.push_back("test_mod" + std::to_string(i));
-      module_data.emplace_back(module_size, std::byte{static_cast<unsigned char>(0x40 + (i % 16))});
+      m_module_names.push_back("test_mod" + kstd::to_string(i));
+      m_module_data.emplace_back(module_size, std::byte{static_cast<unsigned char>(0x40 + (i % 16))});
     }
 
     for (std::size_t i = 0; i < module_count; ++i)
     {
-      registry.add_boot_module(kapi::boot_modules::boot_module{
-        module_names[i], kapi::memory::linear_address{module_data[i].data()}, module_data[i].size()});
+      m_registry.add_boot_module(kapi::boot_modules::boot_module{
+        m_module_names[i].view(), kapi::memory::linear_address{m_module_data[i].data()}, m_module_data[i].size()});
+    }
+
+    kapi::boot_modules::set_boot_module_registry(m_registry);
+    kernel::devices::storage::management::init();
+  }
+
+  auto storage_boot_module_fixture::setup_modules_from_img(kstd::vector<kstd::string> const & module_names,
+                                                           kstd::vector<std::filesystem::path> const & img_paths)
+      -> void
+  {
+    m_module_names.clear();
+    m_module_data.clear();
+    m_registry = {};
+
+    if (module_names.size() != img_paths.size())
+    {
+      throw std::invalid_argument{"Module names and image paths vectors must have the same size."};
+    }
+
+    for (size_t i = 0; i < module_names.size(); ++i)
+    {
+      setup_module_from_img(module_names[i], img_paths[i]);
     }
 
-    kapi::boot_modules::set_boot_module_registry(registry);
+    kapi::boot_modules::set_boot_module_registry(m_registry);
     kernel::devices::storage::management::init();
   }
+
+  auto storage_boot_module_fixture::setup_module_from_img(kstd::string const & module_name,
+                                                          std::filesystem::path const & img_path) -> void
+  {
+    auto file = std::ifstream{img_path, std::ios::binary | std::ios::ate};
+    if (!file)
+    {
+      throw std::runtime_error{"Failed to open image file for test boot module: " + img_path.string()};
+    }
+
+    auto const end_pos = file.tellg();
+    if (end_pos < 0)
+    {
+      throw std::runtime_error{"Failed to determine image file size for test boot module: " + img_path.string()};
+    }
+
+    auto const size = static_cast<std::size_t>(end_pos);
+    file.seekg(0, std::ios::beg);
+
+    m_module_names.push_back(module_name);
+    m_module_data.emplace_back(size);
+
+    if (size > 0)
+    {
+      file.read(reinterpret_cast<char *>(m_module_data.back().data()), static_cast<std::streamsize>(size));
+      if (!file)
+      {
+        throw std::runtime_error{"Failed to read image file content for test boot module: " + img_path.string()};
+      }
+    }
+
+    m_registry.add_boot_module(kapi::boot_modules::boot_module{
+      m_module_names.back().view(), kapi::memory::linear_address{m_module_data.back().data()},
+      m_module_data.back().size()});
+  }
 }  // namespace kernel::tests::filesystem
\ No newline at end of file
diff --git a/kernel/src/test_support/filesystem/storage_boot_module_vfs_fixture.cpp b/kernel/src/test_support/filesystem/storage_boot_module_vfs_fixture.cpp
new file mode 100644
index 0000000..cba7278
--- /dev/null
+++ b/kernel/src/test_support/filesystem/storage_boot_module_vfs_fixture.cpp
@@ -0,0 +1,32 @@
+#include "kernel/test_support/filesystem/storage_boot_module_vfs_fixture.hpp"
+
+#include "kernel/filesystem/vfs.hpp"
+#include "kernel/test_support/filesystem/vfs.hpp"
+
+#include <kstd/string>
+#include <kstd/vector>
+
+#include <cstddef>
+#include <filesystem>
+
+namespace kernel::tests::filesystem
+{
+  storage_boot_module_vfs_fixture::~storage_boot_module_vfs_fixture()
+  {
+    kernel::tests::filesystem::vfs::deinit();
+  }
+
+  auto storage_boot_module_vfs_fixture::setup_modules_and_init_vfs(std::size_t module_count, std::size_t module_size)
+      -> void
+  {
+    setup_modules(module_count, module_size);
+    kernel::filesystem::vfs::init();
+  }
+
+  auto storage_boot_module_vfs_fixture::setup_modules_from_img_and_init_vfs(
+      kstd::vector<kstd::string> const & module_names, kstd::vector<std::filesystem::path> const & img_paths) -> void
+  {
+    setup_modules_from_img(module_names, img_paths);
+    kernel::filesystem::vfs::init();
+  }
+}  // namespace kernel::tests::filesystem
\ No newline at end of file
diff --git a/kernel/src/test_support/filesystem/test_assets/ext2_1KB_fs.img b/kernel/src/test_support/filesystem/test_assets/ext2_1KB_fs.img
new file mode 100644
index 0000000..9f1ee4a
--- /dev/null
+++ b/kernel/src/test_support/filesystem/test_assets/ext2_1KB_fs.img
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94d3988bc309eb9e81f06042c72bf4c4fb5991cd7fdd597eb00c518a96c792d8
+size 10485760
diff --git a/kernel/src/test_support/filesystem/test_assets/ext2_2KB_fs.img b/kernel/src/test_support/filesystem/test_assets/ext2_2KB_fs.img
new file mode 100644
index 0000000..1880911
--- /dev/null
+++ b/kernel/src/test_support/filesystem/test_assets/ext2_2KB_fs.img
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a13da5abb9c65c737105b1da0d4344c7cd7604c7952c762c4f4e3d3f96fd42d
+size 5242880
diff --git a/kernel/src/test_support/filesystem/test_assets/ext2_4KB_fs.img b/kernel/src/test_support/filesystem/test_assets/ext2_4KB_fs.img
new file mode 100644
index 0000000..3aaceb8
--- /dev/null
+++ b/kernel/src/test_support/filesystem/test_assets/ext2_4KB_fs.img
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ce6a1aea277906e1af6de223c017ff900b96569f076b4d99fc04eaa1ee986f4
+size 10485760