flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Require semi-colon at end of function-like macros (#4719)

Browse Source
This commit is contained in:
peterbell10
2020-05-05 21:39:59 +01:00
committed by GitHub
parent f4b5c4c341
commit 8e2dfce84b
4 changed files with 100 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
tests/TestHelpers.h
View File

@@ -45,12 +45,14 @@ public:
/** Checks that the two values are equal; if not, throws a TestException. */
#define TEST_EQUAL(VAL1, VAL2) \
if (VAL1 != VAL2) \
{ \
throw TestException(__FILE__, __LINE__, __FUNCTION__, Printf("Equality test failed: %s != %s", \
#VAL1, #VAL2 \
)); \
}
do { \
if (VAL1 != VAL2) \
{ \
throw TestException( \
__FILE__, __LINE__, __FUNCTION__, \
Printf("Equality test failed: %s != %s", #VAL1, #VAL2)); \
} \
} while (false)
@@ -58,12 +60,14 @@ public:
/** Checks that the two values are equal; if not, throws a TestException, includes the specified message. */
#define TEST_EQUAL_MSG(VAL1, VAL2, MSG) \
if (VAL1 != VAL2) \
{ \
throw TestException(__FILE__, __LINE__, __FUNCTION__, Printf("Equality test failed: %s != %s (%s)", \
#VAL1, #VAL2, MSG \
)); \
}
do { \
if (VAL1 != VAL2) \
{ \
throw TestException( \
__FILE__, __LINE__, __FUNCTION__, \
Printf("Equality test failed: %s != %s (%s)", #VAL1, #VAL2, MSG)); \
} \
} while (false)
@@ -71,12 +75,15 @@ public:
/** Checks that the two values are not equal; if they are, throws a TestException. */
#define TEST_NOTEQUAL(VAL1, VAL2) \
if (VAL1 == VAL2) \
{ \
throw TestException(__FILE__, __LINE__, __FUNCTION__, Printf("Inequality test failed: %s == %s", \
#VAL1, #VAL2 \
)); \
}
do { \
if (VAL1 == VAL2) \
{ \
throw TestException( \
__FILE__, __LINE__, __FUNCTION__, \
Printf("Inequality test failed: %s == %s", #VAL1, #VAL2) \
); \
} \
} while(false)
@@ -124,29 +131,36 @@ public:
/** Checks that the statement throws an exception of the specified class. */
#define TEST_THROWS(Stmt, ExcClass) \
try \
{ \
Stmt; \
throw TestException(__FILE__, __LINE__, __FUNCTION__, Printf("Failed to throw an exception of type %s", \
#ExcClass \
)); \
} \
catch (const ExcClass &) \
{ \
/* This is the expected case. */ \
} \
catch (const std::exception & exc) \
{ \
throw TestException(__FILE__, __LINE__, __FUNCTION__, Printf("An unexpected std::exception descendant was thrown, was expecting type %s. Message is: %s", \
#ExcClass, exc.what() \
)); \
} \
catch (...) \
{ \
throw TestException(__FILE__, __LINE__, __FUNCTION__, Printf("An unexpected unknown exception object was thrown, was expecting type %s", \
#ExcClass \
)); \
}
do { \
try \
{ \
Stmt; \
throw TestException( \
__FILE__, __LINE__, __FUNCTION__, \
Printf("Failed to throw an exception of type %s", #ExcClass) \
); \
} \
catch (const ExcClass &) \
{ \
/* This is the expected case. */ \
} \
catch (const std::exception & exc) \
{ \
throw TestException( \
__FILE__, __LINE__, __FUNCTION__, \
Printf("An unexpected std::exception descendant was thrown, was expecting type %s. Message is: %s", \
#ExcClass, exc.what() \
)); \
} \
catch (...)\
{ \
throw TestException( \
__FILE__, __LINE__, __FUNCTION__, \
Printf("An unexpected unknown exception object was thrown, was expecting type %s", \
#ExcClass \
)); \
} \
} while (false)
@@ -154,19 +168,23 @@ public:
/** Checks that the statement throws an exception of any type. */
#define TEST_THROWS_ANY(Stmt) \
try \
{ \
Stmt; \
throw TestException(__FILE__, __LINE__, __FUNCTION__, "Failed to throw an exception of any type"); \
} \
catch (const TestException & exc) \
{ \
throw exc; \
} \
catch (...) \
{ \
/* This is the expected case */ \
}
do { \
try \
{ \
Stmt; \
throw TestException( \
__FILE__, __LINE__, __FUNCTION__, \
"Failed to throw an exception of any type"); \
} \
catch (const TestException & exc) \
{ \
throw exc; \
} \
catch (...)\
{ \
/* This is the expected case */ \
} \
} while (false)
@@ -174,7 +192,7 @@ public:
/** Fails the test unconditionally, with the specified message. */
#define TEST_FAIL(MSG) \
throw TestException(__FILE__, __LINE__, __FUNCTION__, MSG);
throw TestException(__FILE__, __LINE__, __FUNCTION__, MSG)
@@ -184,7 +202,7 @@ public:
#ifdef _DEBUG
#define TEST_ASSERTS(Stmt) TEST_THROWS(Stmt, cAssertFailure)
#else
#define TEST_ASSERTS(Stmt) LOG("Skipped, cannot test in Release mode: TEST_ASSERT(%s); (%s:%d)", #Stmt, __FILE__, __LINE__);
#define TEST_ASSERTS(Stmt) LOG("Skipped, cannot test in Release mode: TEST_ASSERT(%s); (%s:%d)", #Stmt, __FILE__, __LINE__)
#endif // else _DEBUG