From b3209ac2564f21f3b78ecf5e0c05ca346a4a4276 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Tue, 28 Apr 2026 10:49:34 +0200
Subject: refactor inode kind

---
 kernel/src/filesystem/ext2/inode.tests.cpp | 37 +++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'kernel/src/filesystem/ext2/inode.tests.cpp')

diff --git a/kernel/src/filesystem/ext2/inode.tests.cpp b/kernel/src/filesystem/ext2/inode.tests.cpp
index 4d61790..e68352f 100644
--- a/kernel/src/filesystem/ext2/inode.tests.cpp
+++ b/kernel/src/filesystem/ext2/inode.tests.cpp
@@ -23,21 +23,34 @@ SCENARIO("Ext2 inode initialization and properties", "[filesystem][ext2][inode]"
   GIVEN("an ext2 filesystem")
   {
     auto fs = kernel::filesystem::ext2::filesystem{};
+    auto data = kernel::filesystem::ext2::inode_data{};
 
-    THEN("the inode is initialized and has the kind regular")
+    THEN("the inode is initialized with regular file mode in data and has the kind regular")
     {
-      auto inode = kernel::filesystem::ext2::inode{&fs};
+      data.mode = kernel::filesystem::ext2::constants::mode_regular;
+      auto inode = kernel::filesystem::ext2::inode(&fs, data);
+
       REQUIRE(inode.is_regular());
       REQUIRE(!inode.is_directory());
       REQUIRE(!inode.is_device());
     }
+
+    THEN("the inode is initialized with directory mode in data and has the kind directory")
+    {
+      data.mode = kernel::filesystem::ext2::constants::mode_directory;
+      auto inode = kernel::filesystem::ext2::inode(&fs, data);
+
+      REQUIRE(!inode.is_regular());
+      REQUIRE(inode.is_directory());
+      REQUIRE(!inode.is_device());
+    }
   }
 
   GIVEN("no filesystem (null pointer)")
   {
     THEN("constructing an inode with a null filesystem pointer panics")
     {
-      REQUIRE_THROWS_AS(kernel::filesystem::ext2::inode{nullptr}, kernel::tests::cpu::halt);
+      REQUIRE_THROWS_AS(kernel::filesystem::ext2::inode(nullptr, {}), kernel::tests::cpu::halt);
     }
   }
 }
@@ -102,9 +115,10 @@ SCENARIO("Ext2 inode read stops when block mapping resolves to zero", "[filesyst
     auto fs = kernel::filesystem::ext2::filesystem{};
     REQUIRE(fs.mount(dev_inode) == kernel::filesystem::filesystem::operation_result::success);
 
-    auto inode = kernel::filesystem::ext2::inode{&fs};
-    inode.m_data.blocks = 2;
-    inode.m_data.block[0] = 0;
+    auto data = kernel::filesystem::ext2::inode_data{};
+    data.blocks = 2;
+    data.block[0] = 0;
+    auto inode = kernel::filesystem::ext2::inode{&fs, data};
 
     auto buffer = kstd::vector<std::byte>(32, std::byte{0xAB});
 
@@ -130,12 +144,13 @@ SCENARIO("Ext2 inode read across block boundaries", "[filesystem][ext2][inode]")
     auto fs = kernel::filesystem::ext2::filesystem{};
     REQUIRE(fs.mount(dev_inode) == kernel::filesystem::filesystem::operation_result::success);
 
-    auto inode = kernel::filesystem::ext2::inode{&fs};
-    inode.m_data.blocks = 2;
-    inode.m_data.block[0] = 20;
+    auto inode_data = kernel::filesystem::ext2::inode_data{};
+    inode_data.blocks = 2;
+    inode_data.block[0] = 20;
     kernel::tests::filesystem::ext2::write_bytes(*device, 21 * block_size - 6, "Hello ", 6);
-    inode.m_data.block[1] = 21;
+    inode_data.block[1] = 21;
     kernel::tests::filesystem::ext2::write_bytes(*device, 21 * block_size, "World!", 6);
+    auto inode = kernel::filesystem::ext2::inode{&fs, inode_data};
 
     auto buffer = kstd::vector<std::byte>(12, std::byte{0x00});
 
@@ -155,7 +170,7 @@ SCENARIO("Ext2 inode write is not implemented", "[filesystem][ext2][inode]")
   GIVEN("an ext2 inode")
   {
     auto fs = kernel::filesystem::ext2::filesystem{};
-    auto inode = kernel::filesystem::ext2::inode{&fs};
+    auto inode = kernel::filesystem::ext2::inode{&fs, kernel::filesystem::ext2::inode_data{}};
 
     THEN("writing to the inode panics")
     {
-- 
cgit v1.2.3