Merge branch 'refactoring' into 'develop-BA-FS26'

refactoring

See merge request teachos/kernel!38

1 files changed, 4 insertions, 15 deletions

diff --git a/kernel/src/filesystem/open_file_table.tests.cpp b/kernel/src/filesystem/open_file_table.tests.cpp
index 456d6b7..3e91111 100644
--- a/kernel/src/filesystem/open_file_table.tests.cpp
+++ b/kernel/src/filesystem/open_file_table.tests.cpp
@@ -36,7 +36,7 @@ SCENARIO("Open file table add/get file", "[filesystem][open_file_table]")
 
       THEN("the file descriptor can be retrieved using the returned file descriptor")
       {
-        auto retrieved_descriptor = table.get_file(fd_1);
+        auto retrieved_descriptor = table.file(fd_1);
         REQUIRE(retrieved_descriptor == file_descriptor_1);
       }
     }
@@ -52,15 +52,9 @@ SCENARIO("Open file table add/get file", "[filesystem][open_file_table]")
       REQUIRE(fd == -1);
     }
 
-    THEN("retrieving a file descriptor with a negative file descriptor returns a null pointer")
-    {
-      auto retrieved_descriptor = table.get_file(-1);
-      REQUIRE(retrieved_descriptor == nullptr);
-    }
-
     THEN("retrieving a file descriptor with an out-of-bounds file descriptor returns a null pointer")
     {
-      auto retrieved_descriptor = table.get_file(1000);
+      auto retrieved_descriptor = table.file(1000);
       REQUIRE(retrieved_descriptor == nullptr);
     }
   }
@@ -82,7 +76,7 @@ SCENARIO("Open file table remove file", "[filesystem][open_file_table]")
 
       THEN("the file descriptor can no longer be retrieved using the file descriptor")
       {
-        auto retrieved_descriptor = table.get_file(fd);
+        auto retrieved_descriptor = table.file(fd);
         REQUIRE(retrieved_descriptor == nullptr);
       }
     }
@@ -94,7 +88,7 @@ SCENARIO("Open file table remove file", "[filesystem][open_file_table]")
 
       THEN("the second file descriptor can still be retrieved using its file descriptor")
       {
-        auto retrieved_descriptor = table.get_file(fd2);
+        auto retrieved_descriptor = table.file(fd2);
         REQUIRE(retrieved_descriptor == file_descriptor);
       }
     }
@@ -104,11 +98,6 @@ SCENARIO("Open file table remove file", "[filesystem][open_file_table]")
   {
     auto & table = kernel::filesystem::open_file_table::get();
 
-    THEN("removing a file with a negative file descriptor does nothing")
-    {
-      REQUIRE_NOTHROW(table.remove_file(-1));
-    }
-
     THEN("removing a file with an out-of-bounds file descriptor does nothing")
     {
       REQUIRE_NOTHROW(table.remove_file(1000));