diff options
Diffstat (limited to 'examples/cppunittest/NotEqualExceptionTest.cpp')
| -rw-r--r-- | examples/cppunittest/NotEqualExceptionTest.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/examples/cppunittest/NotEqualExceptionTest.cpp b/examples/cppunittest/NotEqualExceptionTest.cpp index 539e853..43522fb 100644 --- a/examples/cppunittest/NotEqualExceptionTest.cpp +++ b/examples/cppunittest/NotEqualExceptionTest.cpp @@ -1,8 +1,10 @@ +#include "CoreSuite.h" #include "NotEqualExceptionTest.h" #include <cppunit/NotEqualException.h> -CPPUNIT_TEST_SUITE_REGISTRATION( NotEqualExceptionTest ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( NotEqualExceptionTest, + CppUnitTest::coreSuiteName() ); NotEqualExceptionTest::NotEqualExceptionTest() @@ -33,12 +35,18 @@ NotEqualExceptionTest::testConstructor() { std::string expectedValue( "expectedValue" ); std::string actualValue( "actualValue" ); - CppUnit::NotEqualException e( expectedValue, actualValue ); + std::string message( "message" ); + CppUnit::NotEqualException e( expectedValue, + actualValue, + CppUnit::SourceLine( "f.cpp", 123), + message ); CPPUNIT_ASSERT_EQUAL( expectedValue, e.expectedValue() ); CPPUNIT_ASSERT_EQUAL( actualValue, e.actualValue() ); + CPPUNIT_ASSERT_EQUAL( message, e.additionalMessage() ); + CPPUNIT_ASSERT( CppUnit::SourceLine( "f.cpp", 123) == e.sourceLine() ); - std::string expectedMessage( "Expected: expectedValue, but was: actualValue" ); + std::string expectedMessage( "Expected: expectedValue, but was: actualValue.message" ); std::string actualMessage( e.what() ); CPPUNIT_ASSERT_EQUAL( expectedMessage, actualMessage ); } @@ -47,7 +55,10 @@ NotEqualExceptionTest::testConstructor() void NotEqualExceptionTest::testClone() { - CppUnit::NotEqualException e( "expectedValue", "actualValue" ); + CppUnit::NotEqualException e( "expectedValue", + "actualValue", + CppUnit::SourceLine("file.cpp", 2), + "add-message" ); std::auto_ptr<CppUnit::NotEqualException> other( (CppUnit::NotEqualException *)e.clone() ); CPPUNIT_ASSERT_EQUAL( std::string( e.what() ), @@ -67,7 +78,10 @@ NotEqualExceptionTest::testIsInstanceOf() void NotEqualExceptionTest::testAssignment() { - CppUnit::NotEqualException e( "expectedValue", "actualValue" ); + CppUnit::NotEqualException e( "expectedValue", + "actualValue", + CppUnit::SourceLine("file.cpp", 2), + "add-message" ); CppUnit::NotEqualException other( "", "" ); other = e; CPPUNIT_ASSERT_EQUAL( std::string( e.what() ), |