diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_utils.hpp | 32 | ||||
| -rw-r--r-- | tests/tst_FilePath.cpp | 20 |
2 files changed, 29 insertions, 23 deletions
diff --git a/tests/test_utils.hpp b/tests/test_utils.hpp index 48e3a588..4951ade1 100644 --- a/tests/test_utils.hpp +++ b/tests/test_utils.hpp @@ -19,20 +19,26 @@ #include <iostream> #define EXPECT_TRUE(value) \ - if (!(value)) { \ - std::cerr << fmt("error: %1%:%2%: !%3%\n", \ - __FILE__, __LINE__, (#value)); \ - } + do { \ + if (!(value)) { \ + std::cerr << fmt("error: %1%:%2%: !%3%\n", \ + __FILE__, __LINE__, (#value)); \ + } \ + } while (0) #define EXPECT_FALSE(value) \ - if ((value)) { \ - std::cerr << (fmt("error: %1%:%2%: !%3%\n", \ - __FILE__, __LINE__, (#value))); \ - } + do { \ + if ((value)) { \ + std::cerr << (fmt("error: %1%:%2%: !%3%\n", \ + __FILE__, __LINE__, (#value))); \ + } \ + } while (0) #define EXPECT_EQ(value, expected) \ - if (!((value) == (expected))) { \ - std::cerr << fmt("error: %1%:%2%: %3% != %4%\n", \ - __FILE__, __LINE__, (#value), (#expected)); \ - std::cerr << "note: actual value: " << value << std::endl; \ - } + do { \ + if (!((value) == (expected))) { \ + std::cerr << fmt("error: %1%:%2%: %3% != %4%\n", \ + __FILE__, __LINE__, (#value), (#expected)); \ + std::cerr << "note: actual value: " << value << std::endl; \ + } \ + } while (0) diff --git a/tests/tst_FilePath.cpp b/tests/tst_FilePath.cpp index 768371fe..cfff2760 100644 --- a/tests/tst_FilePath.cpp +++ b/tests/tst_FilePath.cpp @@ -31,8 +31,8 @@ main(int, char**) { EXPECT_EQ(FilePath("/").parent_path(), FilePath("/")); - EXPECT_TRUE(FilePath("/abs").is_absolute()) - EXPECT_FALSE(FilePath("/abs").is_relative()) + EXPECT_TRUE(FilePath("/abs").is_absolute()); + EXPECT_FALSE(FilePath("/abs").is_relative()); EXPECT_EQ(FilePath("/abs").root_name(), FilePath()); EXPECT_EQ(FilePath("/abs").root_directory(), FilePath("/")); EXPECT_EQ(FilePath("/abs").root_path(), FilePath("/")); @@ -42,8 +42,8 @@ main(int, char**) EXPECT_EQ(FilePath("/abs").stem(), FilePath("abs")); EXPECT_EQ(FilePath("/abs").extension(), FilePath()); - EXPECT_FALSE(FilePath("rel").is_absolute()) - EXPECT_TRUE(FilePath("rel").is_relative()) + EXPECT_FALSE(FilePath("rel").is_absolute()); + EXPECT_TRUE(FilePath("rel").is_relative()); EXPECT_EQ(FilePath("rel").root_name(), FilePath()); EXPECT_EQ(FilePath("rel").root_directory(), FilePath()); EXPECT_EQ(FilePath("rel").root_path(), FilePath()); @@ -53,20 +53,20 @@ main(int, char**) EXPECT_EQ(FilePath("rel").stem(), "rel"); EXPECT_EQ(FilePath("rel").extension(), FilePath()); - EXPECT_FALSE(FilePath("file.txt").is_absolute()) - EXPECT_TRUE(FilePath("file.txt").is_relative()) + EXPECT_FALSE(FilePath("file.txt").is_absolute()); + EXPECT_TRUE(FilePath("file.txt").is_relative()); EXPECT_EQ(FilePath("file.txt").filename(), "file.txt"); EXPECT_EQ(FilePath("file.txt").stem(), "file"); EXPECT_EQ(FilePath("file.txt").extension(), ".txt"); - EXPECT_TRUE(FilePath("/abs/file.txt").is_absolute()) - EXPECT_FALSE(FilePath("/abs/file.txt").is_relative()) + EXPECT_TRUE(FilePath("/abs/file.txt").is_absolute()); + EXPECT_FALSE(FilePath("/abs/file.txt").is_relative()); EXPECT_EQ(FilePath("/abs/file.txt").filename(), "file.txt"); EXPECT_EQ(FilePath("/abs/file.txt").stem(), "file"); EXPECT_EQ(FilePath("/abs/file.txt").extension(), ".txt"); - EXPECT_FALSE(FilePath("rel/file.txt").is_absolute()) - EXPECT_TRUE(FilePath("rel/file.txt").is_relative()) + EXPECT_FALSE(FilePath("rel/file.txt").is_absolute()); + EXPECT_TRUE(FilePath("rel/file.txt").is_relative()); EXPECT_EQ(FilePath("rel/file.txt").filename(), "file.txt"); EXPECT_EQ(FilePath("rel/file.txt").stem(), "file"); EXPECT_EQ(FilePath("rel/file.txt").extension(), ".txt"); |