aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernel/src/filesystem/devfs/filesystem.tests.cpp2
-rw-r--r--kernel/src/filesystem/devfs/inode.tests.cpp1
-rw-r--r--kernel/src/filesystem/device_inode.tests.cpp1
-rw-r--r--kernel/src/filesystem/ext2/inode.tests.cpp26
-rw-r--r--kernel/src/filesystem/mount_table.tests.cpp8
-rw-r--r--kernel/src/filesystem/rootfs/inode.tests.cpp1
-rw-r--r--libs/kstd/kstd/string.test.cpp12
7 files changed, 27 insertions, 24 deletions
diff --git a/kernel/src/filesystem/devfs/filesystem.tests.cpp b/kernel/src/filesystem/devfs/filesystem.tests.cpp
index 2b6c09b..36cb411 100644
--- a/kernel/src/filesystem/devfs/filesystem.tests.cpp
+++ b/kernel/src/filesystem/devfs/filesystem.tests.cpp
@@ -47,7 +47,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_fixture,
{
auto non_directory_inode = fs.lookup(fs.root_inode(), "ram0");
REQUIRE(non_directory_inode != nullptr);
- REQUIRE(!non_directory_inode->is_directory());
+ REQUIRE_FALSE(non_directory_inode->is_directory());
auto result = fs.lookup(non_directory_inode, "anything");
REQUIRE(result == nullptr);
diff --git a/kernel/src/filesystem/devfs/inode.tests.cpp b/kernel/src/filesystem/devfs/inode.tests.cpp
index 030d709..ae26e74 100644
--- a/kernel/src/filesystem/devfs/inode.tests.cpp
+++ b/kernel/src/filesystem/devfs/inode.tests.cpp
@@ -19,6 +19,7 @@ SCENARIO("Devfs inode creation", "[filesystem][devfs][inode]")
REQUIRE(inode.is_directory());
REQUIRE_FALSE(inode.is_device());
REQUIRE_FALSE(inode.is_regular());
+ REQUIRE_FALSE(inode.is_symbolic_link());
}
}
}
diff --git a/kernel/src/filesystem/device_inode.tests.cpp b/kernel/src/filesystem/device_inode.tests.cpp
index 8ac4eff..025a22a 100644
--- a/kernel/src/filesystem/device_inode.tests.cpp
+++ b/kernel/src/filesystem/device_inode.tests.cpp
@@ -33,6 +33,7 @@ SCENARIO("Device inode construction", "[filesystem][device_inode]")
REQUIRE(inode.is_device());
REQUIRE_FALSE(inode.is_directory());
REQUIRE_FALSE(inode.is_regular());
+ REQUIRE_FALSE(inode.is_symbolic_link());
}
}
diff --git a/kernel/src/filesystem/ext2/inode.tests.cpp b/kernel/src/filesystem/ext2/inode.tests.cpp
index f0f4aaf..49ba21b 100644
--- a/kernel/src/filesystem/ext2/inode.tests.cpp
+++ b/kernel/src/filesystem/ext2/inode.tests.cpp
@@ -31,9 +31,9 @@ SCENARIO("Ext2 inode initialization and properties", "[filesystem][ext2][inode]"
auto inode = kernel::filesystem::ext2::inode(&fs, data);
REQUIRE(inode.is_regular());
- REQUIRE(!inode.is_directory());
- REQUIRE(!inode.is_device());
- REQUIRE(!inode.is_symbolic_link());
+ REQUIRE_FALSE(inode.is_directory());
+ REQUIRE_FALSE(inode.is_device());
+ REQUIRE_FALSE(inode.is_symbolic_link());
}
THEN("the inode is initialized with directory mode in data and has the kind directory")
@@ -41,10 +41,10 @@ SCENARIO("Ext2 inode initialization and properties", "[filesystem][ext2][inode]"
data.mode = kernel::filesystem::ext2::constants::mode_directory;
auto inode = kernel::filesystem::ext2::inode(&fs, data);
- REQUIRE(!inode.is_regular());
+ REQUIRE_FALSE(inode.is_regular());
REQUIRE(inode.is_directory());
- REQUIRE(!inode.is_device());
- REQUIRE(!inode.is_symbolic_link());
+ REQUIRE_FALSE(inode.is_device());
+ REQUIRE_FALSE(inode.is_symbolic_link());
}
THEN("the inode is initialized with symbolic link mode in data and has the kind symbolic link")
@@ -52,9 +52,9 @@ SCENARIO("Ext2 inode initialization and properties", "[filesystem][ext2][inode]"
data.mode = kernel::filesystem::ext2::constants::mode_symbolic_link;
auto inode = kernel::filesystem::ext2::inode(&fs, data);
- REQUIRE(!inode.is_regular());
- REQUIRE(!inode.is_directory());
- REQUIRE(!inode.is_device());
+ REQUIRE_FALSE(inode.is_regular());
+ REQUIRE_FALSE(inode.is_directory());
+ REQUIRE_FALSE(inode.is_device());
REQUIRE(inode.is_symbolic_link());
}
@@ -63,10 +63,10 @@ SCENARIO("Ext2 inode initialization and properties", "[filesystem][ext2][inode]"
data.mode = 0;
auto inode = kernel::filesystem::ext2::inode(&fs, data);
- REQUIRE(!inode.is_regular());
- REQUIRE(!inode.is_directory());
- REQUIRE(!inode.is_device());
- REQUIRE(!inode.is_symbolic_link());
+ REQUIRE_FALSE(inode.is_regular());
+ REQUIRE_FALSE(inode.is_directory());
+ REQUIRE_FALSE(inode.is_device());
+ REQUIRE_FALSE(inode.is_symbolic_link());
}
}
diff --git a/kernel/src/filesystem/mount_table.tests.cpp b/kernel/src/filesystem/mount_table.tests.cpp
index 60b1755..e028ac8 100644
--- a/kernel/src/filesystem/mount_table.tests.cpp
+++ b/kernel/src/filesystem/mount_table.tests.cpp
@@ -55,7 +55,7 @@ SCENARIO("Adding, finding and removing mounts in the mount table", "[filesystem]
THEN("dentry flags are set correctly for mounted dentries")
{
REQUIRE(root_dentry1->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
- REQUIRE(!root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
+ REQUIRE_FALSE(root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
}
THEN("finding mounts by path returns the correct mount")
@@ -70,7 +70,7 @@ SCENARIO("Adding, finding and removing mounts in the mount table", "[filesystem]
THEN("removing a mount that has no child mounts succeeds")
{
REQUIRE(table.remove_mount("/mnt") == kernel::filesystem::mount_table::operation_result::removed);
- REQUIRE(!root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
+ REQUIRE_FALSE(root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
REQUIRE(table.find_longest_prefix_mount("/mnt") == mount1);
}
@@ -109,7 +109,7 @@ SCENARIO("Adding, finding and removing mounts in the mount table", "[filesystem]
THEN("removing the topmost mount with the same path succeeds")
{
REQUIRE(table.remove_mount("/") == kernel::filesystem::mount_table::operation_result::removed);
- REQUIRE(!root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
+ REQUIRE_FALSE(root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
REQUIRE(table.find_longest_prefix_mount("/") == mount1);
}
}
@@ -156,7 +156,7 @@ SCENARIO("Adding, finding and removing mounts in the mount table", "[filesystem]
THEN("removing a leaf mount succeeds")
{
REQUIRE(table.remove_mount("/mnt/submnt") == kernel::filesystem::mount_table::operation_result::removed);
- REQUIRE(!root_dentry3->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
+ REQUIRE_FALSE(root_dentry3->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
REQUIRE(table.find_longest_prefix_mount("/mnt/submnt") == mount2);
}
}
diff --git a/kernel/src/filesystem/rootfs/inode.tests.cpp b/kernel/src/filesystem/rootfs/inode.tests.cpp
index 879818c..7cc217f 100644
--- a/kernel/src/filesystem/rootfs/inode.tests.cpp
+++ b/kernel/src/filesystem/rootfs/inode.tests.cpp
@@ -17,6 +17,7 @@ SCENARIO("Rootfs inode creation", "[filesystem][rootfs][inode]")
REQUIRE(inode.is_directory());
REQUIRE_FALSE(inode.is_device());
REQUIRE_FALSE(inode.is_regular());
+ REQUIRE_FALSE(inode.is_symbolic_link());
}
THEN("the inode has no children")
diff --git a/libs/kstd/kstd/string.test.cpp b/libs/kstd/kstd/string.test.cpp
index 53d7c9a..9755676 100644
--- a/libs/kstd/kstd/string.test.cpp
+++ b/libs/kstd/kstd/string.test.cpp
@@ -37,7 +37,7 @@ SCENARIO("String initialization and construction", "[string]")
THEN("the string is not empty and has the same size as the view")
{
- REQUIRE(!str.empty());
+ REQUIRE_FALSE(str.empty());
REQUIRE(str.size() == view.size());
}
@@ -58,7 +58,7 @@ SCENARIO("String initialization and construction", "[string]")
THEN("the string is not empty and has the same size as the C-style string")
{
- REQUIRE(!str.empty());
+ REQUIRE_FALSE(str.empty());
REQUIRE(str.size() == std::strlen(c_str));
}
@@ -79,7 +79,7 @@ SCENARIO("String initialization and construction", "[string]")
THEN("the string is not empty and has size 1")
{
- REQUIRE(!str.empty());
+ REQUIRE_FALSE(str.empty());
REQUIRE(str.size() == 1);
}
@@ -294,7 +294,7 @@ SCENARIO("String conversion and comparison", "[string]")
THEN("the strings are not unequal")
{
- REQUIRE(!(str1 != str2));
+ REQUIRE_FALSE(str1 != str2);
}
}
@@ -311,8 +311,8 @@ SCENARIO("String conversion and comparison", "[string]")
THEN("the string and the string view are not unequal")
{
- REQUIRE(!(str != view));
- REQUIRE(!(view != str));
+ REQUIRE_FALSE(str != view);
+ REQUIRE_FALSE(view != str);
}
}
}