diff options
Diffstat (limited to 'include/cppunit/TestAssert.h')
| -rw-r--r-- | include/cppunit/TestAssert.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/cppunit/TestAssert.h b/include/cppunit/TestAssert.h index 2f47f59..835fe9f 100644 --- a/include/cppunit/TestAssert.h +++ b/include/cppunit/TestAssert.h @@ -118,14 +118,15 @@ namespace CppUnit { /** Assertions that a condition is \c true. * \ingroup Assertions */ -#define CPPUNIT_ASSERT(condition) \ - ( ::CppUnit::Asserter::failIf( !(condition), \ - (#condition), \ +#define CPPUNIT_ASSERT(condition) \ + ( ::CppUnit::Asserter::failIf( !(condition), \ + ::CppUnit::Message( "assertion failed", \ + "Expression: " #condition), \ CPPUNIT_SOURCELINE() ) ) #else -#define CPPUNIT_ASSERT(condition) \ - ( ::CppUnit::Asserter::failIf( !(condition), \ - "", \ +#define CPPUNIT_ASSERT(condition) \ + ( ::CppUnit::Asserter::failIf( !(condition), \ + ::CppUnit::Message( "assertion failed" ), \ CPPUNIT_SOURCELINE() ) ) #endif @@ -145,8 +146,9 @@ namespace CppUnit { * \ingroup Assertions * \param message Message reported in diagnostic. */ -#define CPPUNIT_FAIL( message ) \ - ( ::CppUnit::Asserter::fail( message, \ +#define CPPUNIT_FAIL( message ) \ + ( ::CppUnit::Asserter::fail( ::CppUnit::Message( "forced failure", \ + message ), \ CPPUNIT_SOURCELINE() ) ) #ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED |