add deinit functions for singletons in tests

1 files changed, 2 insertions, 44 deletions

diff --git a/kernel/src/filesystem/file_descriptor_table.tests.cpp b/kernel/src/filesystem/file_descriptor_table.tests.cpp
index d8c05ca..5aeadb2 100644
--- a/kernel/src/filesystem/file_descriptor_table.tests.cpp
+++ b/kernel/src/filesystem/file_descriptor_table.tests.cpp
@@ -1,7 +1,6 @@
 #include "kernel/filesystem/file_descriptor_table.hpp"
 
 #include "kernel/filesystem/open_file_description.hpp"
-#include "kernel/test_support/cpu.hpp"
 #include "kernel/test_support/filesystem/inode.hpp"
 
 #include <kstd/memory>
@@ -10,48 +9,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-struct file_descriptor_table_RAII
-{
-  file_descriptor_table_RAII()
-  {
-    kernel::filesystem::file_descriptor_table::init();
-  }
-  ~file_descriptor_table_RAII()
-  {
-    kernel::filesystem::file_descriptor_table::reset();
-  }
-};
-
-struct file_descriptor_table_reset_only
-{
-  ~file_descriptor_table_reset_only()
-  {
-    kernel::filesystem::file_descriptor_table::reset();
-  }
-};
-
-SCENARIO_METHOD(file_descriptor_table_reset_only, "File descriptor table initialization",
-                "[filesystem][file_descriptor_table]")
-{
-  THEN("accessing the file descriptor table before initialization panics")
-  {
-    REQUIRE_THROWS_AS(kernel::filesystem::file_descriptor_table::get(), kernel::tests::cpu::halt);
-  }
-
-  THEN("the file descriptor table can be initialized and accessed")
-  {
-    kernel::filesystem::file_descriptor_table::init();
-    REQUIRE_NOTHROW(kernel::filesystem::file_descriptor_table::get());
-  }
-
-  THEN("initializing the file descriptor table more than once panics")
-  {
-    kernel::filesystem::file_descriptor_table::init();
-    REQUIRE_THROWS_AS(kernel::filesystem::file_descriptor_table::init(), kernel::tests::cpu::halt);
-  }
-}
-
-SCENARIO_METHOD(file_descriptor_table_RAII, "File descriptor table add/get file", "[filesystem][file_descriptor_table]")
+SCENARIO("File descriptor table add/get file", "[filesystem][file_descriptor_table]")
 {
   GIVEN("a file descriptor table and an open file description")
   {
@@ -105,7 +63,7 @@ SCENARIO_METHOD(file_descriptor_table_RAII, "File descriptor table add/get file"
   }
 }
 
-SCENARIO_METHOD(file_descriptor_table_RAII, "File descriptor table remove file", "[filesystem][file_descriptor_table]")
+SCENARIO("File descriptor table remove file", "[filesystem][file_descriptor_table]")
 {
   GIVEN("a file descriptor table with an open file description")
   {