Merge branch 'refactor-dentry-get-full-path' into 'develop-BA-FS26'

Refactor get_full_path remove recursion

See merge request teachos/kernel!31

1 files changed, 27 insertions, 12 deletions

diff --git a/kernel/src/filesystem/dentry.tests.cpp b/kernel/src/filesystem/dentry.tests.cpp
index c42c405..dd01394 100644
--- a/kernel/src/filesystem/dentry.tests.cpp
+++ b/kernel/src/filesystem/dentry.tests.cpp
@@ -13,7 +13,7 @@ SCENARIO("Dentry construction", "[filesystem][dentry]")
   GIVEN("A parent dentry and inode")
   {
     auto inode = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto parent_dentry = kstd::make_shared<kernel::filesystem::dentry>(nullptr, inode);
+    auto parent_dentry = kstd::make_shared<kernel::filesystem::dentry>(nullptr, inode, "parent");
 
     WHEN("constructing a dentry")
     {
@@ -34,18 +34,9 @@ SCENARIO("Dentry construction", "[filesystem][dentry]")
 
     WHEN("constructing a dentry with an empty name")
     {
-      auto child_dentry = kernel::filesystem::dentry{parent_dentry, inode};
-
       THEN("the dentry has the correct parent and inode, and an empty name")
       {
-        REQUIRE(child_dentry.get_parent() == parent_dentry);
-        REQUIRE(child_dentry.get_inode() == inode);
-        REQUIRE(child_dentry.get_name().empty());
-      }
-
-      THEN("no flag is set")
-      {
-        REQUIRE_FALSE(child_dentry.has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
+        REQUIRE_THROWS_AS((kernel::filesystem::dentry{parent_dentry, inode, ""}), kernel::tests::cpu::halt);
       }
     }
 
@@ -81,7 +72,7 @@ SCENARIO("Dentry child logic", "[filesystem][dentry]")
   GIVEN("A parent dentry and inode")
   {
     auto inode = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto parent_dentry = kstd::make_shared<kernel::filesystem::dentry>(nullptr, inode);
+    auto parent_dentry = kstd::make_shared<kernel::filesystem::dentry>(nullptr, inode, "parent");
 
     WHEN("adding child dentries")
     {
@@ -133,3 +124,27 @@ SCENARIO("Dentry Flag logic", "[filesystem][dentry]")
     }
   }
 }
+
+SCENARIO("Dentry path resolution", "[filesystem][dentry]")
+{
+  GIVEN("A dentry with a parent hierarchy")
+  {
+    auto root_inode = kstd::make_shared<kernel::tests::filesystem::inode>();
+    auto root_dentry = kstd::make_shared<kernel::filesystem::dentry>(nullptr, root_inode, "/");
+
+    auto home_inode = kstd::make_shared<kernel::tests::filesystem::inode>();
+    auto home_dentry = kstd::make_shared<kernel::filesystem::dentry>(root_dentry, home_inode, "home");
+    root_dentry->add_child(home_dentry);
+
+    auto user_inode = kstd::make_shared<kernel::tests::filesystem::inode>();
+    auto user_dentry = kstd::make_shared<kernel::filesystem::dentry>(home_dentry, user_inode, "user");
+    home_dentry->add_child(user_dentry);
+
+    THEN("the full path is constructed correctly")
+    {
+      REQUIRE(root_dentry->get_absolute_path() == "/");
+      REQUIRE(home_dentry->get_absolute_path() == "/home");
+      REQUIRE(user_dentry->get_absolute_path() == "/home/user");
+    }
+  }
+}
\ No newline at end of file