strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wsd: test: make test assertion failures more obvious

Browse source 
Change-Id: Id076c9b270837840d8aa2bc88fa42e0861ad6df7
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
This commit is contained in:
Ashod Nakashian 2021-03-22 11:32:07 -04:00 committed by Ashod Nakashian
parent 5c6cd3aaec
commit 9f4fcd098e
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/lokassert.hpp
View file

@ -35,7 +35,7 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector<char>& v)
{ \
if (!(condition)) \
{ \
TST_LOG_NAME("unittest", "Assertion failure: " << (#condition)); \
TST_LOG_NAME("unittest", "ERROR: Assertion failure: " << (#condition)); \
LOK_ASSERT_IMPL(condition); \
CPPUNIT_ASSERT(condition); \
} \
@ -46,7 +46,7 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector<char>& v)
{ \
if (!((expected) == (actual))) \
{ \
TST_LOG_NAME("unittest", "Assertion failure: Expected [" \
TST_LOG_NAME("unittest", "ERROR: Assertion failure: Expected [" \
<< (expected) << "] but got [" << (actual) << ']'); \
LOK_ASSERT_IMPL((expected) == (actual)); \
CPPUNIT_ASSERT_EQUAL((expected), (actual)); \
@ -62,9 +62,9 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector<char>& v)
std::ostringstream oss##__LINE__; \
oss##__LINE__ << message; \
const auto msg##__LINE__ = oss##__LINE__.str(); \
TST_LOG_NAME("unittest", "Assertion failure: " << msg##__LINE__ << ". Expected [" \
<< (expected) << "] but got [" \
<< (actual) << "]: "); \
TST_LOG_NAME("unittest", "ERROR: Assertion failure: " \
<< msg##__LINE__ << ". Expected [" << (expected) \
<< "] but got [" << (actual) << "]: "); \
CPPUNIT_ASSERT_EQUAL_MESSAGE(msg##__LINE__, (expected), (actual)); \
} \
} while (false)
@ -74,8 +74,8 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector<char>& v)
{ \
if (!(condition)) \
{ \
TST_LOG_NAME("unittest", \
"Assertion failure: " << (message) << ". Condition: " << (#condition)); \
TST_LOG_NAME("unittest", "ERROR: Assertion failure: " << (message) << ". Condition: " \
<< (#condition)); \
LOK_ASSERT_IMPL(condition); \
CPPUNIT_ASSERT_MESSAGE((message), (condition)); \
} \
@ -84,7 +84,7 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector<char>& v)
#define LOK_ASSERT_FAIL(message) \
do \
{ \
TST_LOG_NAME("unittest", "Forced failure: " << (message)); \
TST_LOG_NAME("unittest", "ERROR: Forced failure: " << (message)); \
LOK_ASSERT_IMPL(!"Forced failure"); \
CPPUNIT_FAIL((message)); \
} while (false)