diff options
Diffstat (limited to 'src/cppunit/TestAssert.cpp')
| -rw-r--r-- | src/cppunit/TestAssert.cpp | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/src/cppunit/TestAssert.cpp b/src/cppunit/TestAssert.cpp index 802d5e4..b5999e1 100644 --- a/src/cppunit/TestAssert.cpp +++ b/src/cppunit/TestAssert.cpp @@ -13,34 +13,38 @@ namespace CppUnit { #ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED /// Check for a failed general assertion -void TestAssert::assertImplementation (bool condition, - std::string conditionExpression, - long lineNumber, - std::string fileName) -{ - if (!condition) - throw Exception (conditionExpression, - lineNumber, - fileName); +void +TestAssert::assertImplementation( bool condition, + std::string conditionExpression, + long lineNumber, + std::string fileName ) +{ + Asserter::failIf( condition, + conditionExpression, + SourceLine( fileName, lineNumber ) ); } /// Reports failed equality -void TestAssert::assertNotEqualImplementation( std::string expected, - std::string actual, - long lineNumber, - std::string fileName ) +void +TestAssert::assertNotEqualImplementation( std::string expected, + std::string actual, + long lineNumber, + std::string fileName ) { - throw NotEqualException( expected, actual, lineNumber, fileName ); + Asserter::failNotEqual( expected, + actual, + SouceLine( fileName, lineNumber ), "" ); } /// Check for a failed equality assertion -void TestAssert::assertEquals (double expected, - double actual, - double delta, - long lineNumber, - std::string fileName) +void +TestAssert::assertEquals( double expected, + double actual, + double delta, + long lineNumber, + std::string fileName ) { if (fabs (expected - actual) > delta) assertNotEqualImplementation( assertion_traits<double>::toString(expected), @@ -49,7 +53,7 @@ void TestAssert::assertEquals (double expected, fileName ); } -#else +#else // CPPUNIT_ENABLE_SOURCELINE_DEPRECATED void TestAssert::assertDoubleEquals( double expected, |