Include/cppunit/Asserter.

include/cppunit/Asserter.h:
* src/cppunit/Asserter.cpp: added functions that take a Message as a
parameter. Existing function have a short description indicating
an assertion failure.

* include/cppunit/CompilerOuputter.h:
* src/cppunit/CompilerOuputter.cpp: removed printNotEqualMessage() and
printDefaultMessage(). Updated to use Message.

* include/cppunit/Message.h:
* src/cppunit/Message.cpp: added. Represents a message associated to an
Exception.

* include/cppunit/Exception.h:
* src/cppunit/Exception.cpp: the message associated to the exception is now
stored as a Message instead of a string.

* include/cppunit/NotEqualException.cpp: constructs a Message instead of a
string.

* include/cppunit/TestAssert.h:
* src/cppunit/TestAssert.cpp: updated to use Asserter functions that
take a message when pertinent (CPPUNIT_FAIL...).

* include/cppunit/TestCaller.h:
* src/cppunit/TestCaller.cpp: exception not caught failure has a better
short description.

* src/cppunit/TestCase.cpp: better short description when setUp() or
tearDown() fail.

* src/msvc6/testrunner/TestRunnerDlg.cpp: replace '\n' in failure message
with space.

* examples/cppunittest/ExceptionTest.cpp:
* examples/cppunittest/NotEqualExceptionTest.cpp:
* examples/cppunittest/TestCallerTest.cpp:
* examples/cppunittest/TestFailureTest.cpp:
* examples/cppunittest/TestResultCollectorTest.h:
* examples/cppunittest/TestResultCollectorTest.cpp:
* examples/cppunittest/TestResultTest.cpp:
* examples/cppunittest/XmlOutputterTest.h:
* examples/cppunittest/XmlOutputterTest.cpp: updated to use Exception/Message.

* examples/cppunittest/MessageTest.h:
* examples/cppunittest/MessageTest.cpp: added. Unit test for Message.

1 files changed, 8 insertions, 8 deletions

diff --git a/examples/cppunittest/TestResultCollectorTest.cpp b/examples/cppunittest/TestResultCollectorTest.cpp
index e7617fa..bb60dd6 100644
--- a/examples/cppunittest/TestResultCollectorTest.cpp
+++ b/examples/cppunittest/TestResultCollectorTest.cpp
@@ -49,8 +49,8 @@ TestResultCollectorTest::testConstructor()
 void 
 TestResultCollectorTest::testAddTwoErrors()
 {
-  std::string errorMessage1( "First Error" );
-  std::string errorMessage2( "Second Error" );
+  CppUnit::Message errorMessage1( "First Error" );
+  CppUnit::Message errorMessage2( "Second Error" );
   {
     CppUnit::TestFailure failure1( m_test, 
                                    new CppUnit::Exception( errorMessage1 ),
@@ -78,8 +78,8 @@ TestResultCollectorTest::testAddTwoErrors()
 void 
 TestResultCollectorTest::testAddTwoFailures()
 {
-  std::string errorMessage1( "First Failure" );
-  std::string errorMessage2( "Second Failure" );
+  CppUnit::Message errorMessage1( "First Failure" );
+  CppUnit::Message errorMessage2( "Second Failure" );
   {
     CppUnit::TestFailure failure1( m_test, 
                                    new CppUnit::Exception( errorMessage1 ),
@@ -228,12 +228,12 @@ TestResultCollectorTest::checkResult( int failures,
 
 void
 TestResultCollectorTest::checkFailure( CppUnit::TestFailure *failure,
-                                       std::string expectedMessage,
+                                       CppUnit::Message expectedMessage,
                                        CppUnit::Test *expectedTest,
                                        bool expectedIsError )
 {
-  std::string actualMessage( failure->thrownException()->what() );
-  CPPUNIT_ASSERT_EQUAL( expectedMessage, actualMessage );
+  CppUnit::Message actualMessage( failure->thrownException()->message() );
+  CPPUNIT_ASSERT( expectedMessage == actualMessage );
   CPPUNIT_ASSERT_EQUAL( expectedTest, failure->failedTest() );
   CPPUNIT_ASSERT_EQUAL( expectedIsError, failure->isError() );
 }
@@ -291,7 +291,7 @@ TestResultCollectorTest::addFailure( std::string message,
                                      CppUnit::TestResultCollector *result )
 {
   CppUnit::TestFailure failure( failedTest, 
-                                new CppUnit::Exception( message ), 
+                                new CppUnit::Exception( CppUnit::Message( message ) ), 
                                 isError );
   result->addFailure( failure );
 }