starred/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2026-08-24 10:04:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

hyprtester: Fix some failing tests terminating early (#14969)

Browse Source 
The tests of the form:
```
EXPECT(SOMETHING);  // Fails
ASSERT(SOMETHING ELSE);  // Succeeds
EXPECT(MORE);  // Succeeds
```
should run till the end and then be considered failed
(since the first expection failed).

Due to a bug, they would terminate after the successful `ASSERT`,
if a previous `EXPECT` had failed. Fixed that.
This commit is contained in:
Nikolai Nechaev
2026-06-04 13:25:35 +01:00
committed by GitHub
parent bb13110bcc
commit f5ef95f269
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyprtester/src/shared.hpp
+17 -12
View File
@@ -26,8 +26,11 @@ class CTestCase {
public:
CTestCase() = default;
CTestCase(const CTestCase&) = delete; // Test cases probably should not be copied
bool failed = false;
virtual ~CTestCase() = default;
/// Indicates that some check has failed
bool failed = false;
/// Indicates that the _last_ check has failed
bool just_failed = false;
virtual ~CTestCase() = default;
// TODO: `test` will be protected
virtual void test() = 0;
@@ -54,7 +57,8 @@ class CTestCase {
namespace { \
class Subtest_##name { \
public: \
bool failed = false; \
bool failed = false; \
bool just_failed = false; \
\
void main(__VA_ARGS__); \
}; \
@@ -78,7 +82,7 @@ class CTestCase {
// =================================
/// Marks the test as failed without terminating it
#define MARK_TEST_FAILED_SILENT() this->failed = true
#define MARK_TEST_FAILED_SILENT() this->just_failed = this->failed = true
/// Prints a failure message and makrs the test as failed without terminating it
#define MARK_TEST_FAILED(fmt, ...) \
@@ -103,6 +107,7 @@ class CTestCase {
#define LOG_OK(fmt, ...) \
do { \
this->just_failed = false; \
NLog::log("{}OK:{} " fmt ". Source: {}@{}", Colors::GREEN, Colors::RESET, __VA_ARGS__, __FILE__, __LINE__); \
} while (0)
@@ -190,56 +195,56 @@ class CTestCase {
#define ASSERT_MAX_DELTA(expr, desired, delta) \
do { \
EXPECT_MAX_DELTA(expr, desired, delta); \
if (this->failed) \
if (this->just_failed) \
return; \
} while (0)
#define ASSERT(expr, val) \
do { \
EXPECT(expr, val); \
if (this->failed) \
if (this->just_failed) \
return; \
} while (0)
#define ASSERT_NOT(expr, val) \
do { \
EXPECT_NOT(expr, val); \
if (this->failed) \
if (this->just_failed) \
return; \
} while (0)
#define ASSERT_VECTOR2D(expr, val) \
do { \
EXPECT_VECTOR2D(expr, val); \
if (this->failed) \
if (this->just_failed) \
return; \
} while (0)
#define ASSERT_CONTAINS(haystack, needle) \
do { \
EXPECT_CONTAINS(haystack, needle); \
if (this->failed) \
if (this->just_failed) \
return; \
} while (0)
#define ASSERT_NOT_CONTAINS(haystack, needle) \
do { \
EXPECT_NOT_CONTAINS(haystack, needle); \
if (this->failed) \
if (this->just_failed) \
return; \
} while (0)
#define ASSERT_STARTS_WITH(str, what) \
do { \
EXPECT_STARTS_WITH(str, what); \
if (this->failed) \
if (this->just_failed) \
return; \
} while (0)
#define ASSERT_COUNT_STRING(str, what, no) \
do { \
EXPECT_COUNT_STRING(str, what, no); \
if (this->failed) \
if (this->just_failed) \
return; \
} while (0)