diff options
Diffstat (limited to 'src/cppunit/TestAssert.cpp')
| -rw-r--r-- | src/cppunit/TestAssert.cpp | 55 |
1 files changed, 4 insertions, 51 deletions
diff --git a/src/cppunit/TestAssert.cpp b/src/cppunit/TestAssert.cpp index 8d9ad80..484f372 100644 --- a/src/cppunit/TestAssert.cpp +++ b/src/cppunit/TestAssert.cpp @@ -10,55 +10,11 @@ CPPUNIT_NS_BEGIN -#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED -/// Check for a failed general assertion 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 ) -{ - 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 ) -{ - if (fabs (expected - actual) > delta) - assertNotEqualImplementation( assertion_traits<double>::toString(expected), - assertion_traits<double>::toString(actual), - lineNumber, - fileName ); -} - -#else // CPPUNIT_ENABLE_SOURCELINE_DEPRECATED - -void -TestAssert::assertDoubleEquals( double expected, - double actual, - double delta, - SourceLine sourceLine ) +assertDoubleEquals( double expected, + double actual, + double delta, + SourceLine sourceLine ) { Asserter::failNotEqualIf( fabs( expected - actual ) > delta, assertion_traits<double>::toString(expected), @@ -67,7 +23,4 @@ TestAssert::assertDoubleEquals( double expected, } -#endif - - CPPUNIT_NS_END |