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.

14 files changed, 358 insertions, 28 deletions

diff --git a/examples/cppunittest/CppUnitTestMain.dsp b/examples/cppunittest/CppUnitTestMain.dsp
index 1b685f8..acbbdd9 100644
--- a/examples/cppunittest/CppUnitTestMain.dsp
+++ b/examples/cppunittest/CppUnitTestMain.dsp
@@ -182,6 +182,14 @@ SOURCE=.\ExceptionTest.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\MessageTest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessageTest.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\NotEqualExceptionTest.cpp
 # End Source File
 # Begin Source File
diff --git a/examples/cppunittest/CppUnitTestPlugIn.dsp b/examples/cppunittest/CppUnitTestPlugIn.dsp
index 8ba6580..5e117a7 100644
--- a/examples/cppunittest/CppUnitTestPlugIn.dsp
+++ b/examples/cppunittest/CppUnitTestPlugIn.dsp
@@ -191,6 +191,14 @@ SOURCE=.\ExceptionTest.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\MessageTest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessageTest.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\NotEqualExceptionTest.cpp
 # End Source File
 # Begin Source File
diff --git a/examples/cppunittest/ExceptionTest.cpp b/examples/cppunittest/ExceptionTest.cpp
index ab60eed..e166130 100644
--- a/examples/cppunittest/ExceptionTest.cpp
+++ b/examples/cppunittest/ExceptionTest.cpp
@@ -34,12 +34,12 @@ ExceptionTest::tearDown()
 void 
 ExceptionTest::testConstructor()
 {
-  const std::string message( "a message" );
+  const CppUnit::Message message( "a message" );
   const CppUnit::SourceLine sourceLine( "dir/afile.cpp", 17 );
   
   CppUnit::Exception e( message, sourceLine );
 
-  CPPUNIT_ASSERT_EQUAL( message, std::string( e.what() ) );
+  CPPUNIT_ASSERT_EQUAL( message.shortDescription(), e.message().shortDescription() );
   CPPUNIT_ASSERT( sourceLine == e.sourceLine() );
 }
 
@@ -49,7 +49,7 @@ ExceptionTest::testDefaultConstructor()
 {
   CppUnit::Exception e;
 
-  CPPUNIT_ASSERT_EQUAL( std::string(""), std::string( e.what() ) );
+  CPPUNIT_ASSERT( CppUnit::Message() == e.message() );
   CPPUNIT_ASSERT( !e.sourceLine().isValid() );
 }
 
@@ -58,7 +58,7 @@ void
 ExceptionTest::testCopyConstructor()
 {
   CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
-  CppUnit::Exception e( "message", sourceLine  );
+  CppUnit::Exception e( CppUnit::Message("message"), sourceLine  );
   CppUnit::Exception other( e );
   checkIsSame( e, other );
 }
@@ -68,7 +68,7 @@ void
 ExceptionTest::testAssignment()
 {
   CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
-  CppUnit::Exception e( "message", sourceLine  );
+  CppUnit::Exception e( CppUnit::Message("message"), sourceLine  );
   CppUnit::Exception other;
   other = e;
   checkIsSame( e, other );
@@ -79,7 +79,7 @@ void
 ExceptionTest::testClone()
 {
   CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
-  CppUnit::Exception e( "message", sourceLine  );
+  CppUnit::Exception e( CppUnit::Message("message"), sourceLine  );
   std::auto_ptr<CppUnit::Exception> other( e.clone() );
   checkIsSame( e, *other.get() );
 }
@@ -89,7 +89,7 @@ void
 ExceptionTest::testIsInstanceOf()
 {
   CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
-  CppUnit::Exception e( "message", sourceLine  );
+  CppUnit::Exception e( CppUnit::Message("message"), sourceLine  );
   CPPUNIT_ASSERT( e.isInstanceOf( CppUnit::Exception::type() ) );
   CPPUNIT_ASSERT( !e.isInstanceOf( CppUnit::NotEqualException::type() ) );
 }
diff --git a/examples/cppunittest/Makefile.am b/examples/cppunittest/Makefile.am
index 3c72820..c5a47a0 100644
--- a/examples/cppunittest/Makefile.am
+++ b/examples/cppunittest/Makefile.am
@@ -18,6 +18,8 @@ cppunittestmain_SOURCES = \
 	HelperMacrosTest.cpp \
 	HelperMacrosTest.h \
 	HelperSuite.h \
+	MessageTest.h \
+	MessageTest.cpp \
 	MockTestCase.h \
 	MockTestCase.cpp \
 	MockTestListener.cpp \
diff --git a/examples/cppunittest/MessageTest.cpp b/examples/cppunittest/MessageTest.cpp
new file mode 100644
index 0000000..45b6c96
--- /dev/null
+++ b/examples/cppunittest/MessageTest.cpp
@@ -0,0 +1,231 @@
+#include "CoreSuite.h"
+#include "MessageTest.h"
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MessageTest,
+                                       CppUnitTest::coreSuiteName() );
+
+
+MessageTest::MessageTest()
+{
+}
+
+
+MessageTest::~MessageTest()
+{
+}
+
+
+void 
+MessageTest::setUp()
+{
+  m_message = new CppUnit::Message();
+}
+
+
+void 
+MessageTest::tearDown()
+{
+  delete m_message;
+}
+
+
+void 
+MessageTest::testDefaultConstructor()
+{
+  CPPUNIT_ASSERT_EQUAL( std::string(), m_message->shortDescription() );
+  CPPUNIT_ASSERT_EQUAL( 0, m_message->detailCount() );
+}
+
+
+void 
+MessageTest::testDetailAtThrowIfBadIndex()
+{
+  m_message->detailAt( -1 );
+}
+
+
+
+void 
+MessageTest::testDetailAtThrowIfBadIndex2()
+{
+  m_message->detailAt( 0 );
+}
+
+
+void 
+MessageTest::testAddDetail()
+{
+  std::string expected( "first" );
+  m_message->addDetail( expected );
+  CPPUNIT_ASSERT_EQUAL( 1, m_message->detailCount() );
+  CPPUNIT_ASSERT_EQUAL( expected, m_message->detailAt(0) );
+}
+
+
+void 
+MessageTest::testAddDetail2()
+{
+  std::string expected1( "first" );
+  std::string expected2( "second" );
+  m_message->addDetail( expected1, expected2 );
+  CPPUNIT_ASSERT_EQUAL( 2, m_message->detailCount() );
+  CPPUNIT_ASSERT_EQUAL( expected1, m_message->detailAt(0) );
+  CPPUNIT_ASSERT_EQUAL( expected2, m_message->detailAt(1) );
+}
+
+
+void 
+MessageTest::testAddDetail3()
+{
+  std::string expected1( "first" );
+  std::string expected2( "second" );
+  std::string expected3( "third" );
+  m_message->addDetail( expected1, expected2, expected3 );
+  CPPUNIT_ASSERT_EQUAL( 3, m_message->detailCount() );
+  CPPUNIT_ASSERT_EQUAL( expected1, m_message->detailAt(0) );
+  CPPUNIT_ASSERT_EQUAL( expected2, m_message->detailAt(1) );
+  CPPUNIT_ASSERT_EQUAL( expected3, m_message->detailAt(2) );
+}
+
+
+void 
+MessageTest::testAddDetailEmptyMessage()
+{
+  m_message->addDetail( CppUnit::Message() );
+  CPPUNIT_ASSERT_EQUAL( 0, m_message->detailCount() );
+}
+
+
+void 
+MessageTest::testAddDetailMessage()
+{
+  std::string expected1( "first" );
+  std::string expected2( "second" );
+  m_message->addDetail( CppUnit::Message( "shortDesc", expected1, expected2 ) );
+  CPPUNIT_ASSERT_EQUAL( 2, m_message->detailCount() );
+  CPPUNIT_ASSERT_EQUAL( expected1, m_message->detailAt(0) );
+  CPPUNIT_ASSERT_EQUAL( expected2, m_message->detailAt(1) );
+}
+
+
+void 
+MessageTest::testSetShortDescription()
+{
+  std::string expected( "shortDesc" );
+  m_message->setShortDescription( expected );
+  CPPUNIT_ASSERT_EQUAL( expected, m_message->shortDescription() );
+}
+
+
+void 
+MessageTest::testClearDetails()
+{
+  m_message->addDetail( "detail1" );
+  m_message->clearDetails();
+  CPPUNIT_ASSERT_EQUAL( 0, m_message->detailCount() );
+}
+
+
+void 
+MessageTest::testConstructor()
+{
+  std::string expected( "short" );
+  CppUnit::Message message( expected );
+  
+  CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() );
+  CPPUNIT_ASSERT_EQUAL( 0, message.detailCount() );
+}
+
+
+void 
+MessageTest::testConstructorDetail1()
+{
+  std::string expected( "short" );
+  std::string expected1( "detail-1" );
+  CppUnit::Message message( expected, expected1 );
+  
+  CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() );
+  CPPUNIT_ASSERT_EQUAL( 1, message.detailCount() );
+  CPPUNIT_ASSERT_EQUAL( expected1, message.detailAt(0) );
+}
+
+
+void 
+MessageTest::testConstructorDetail2()
+{
+  std::string expected( "short" );
+  std::string expected1( "detail-1" );
+  std::string expected2( "detail-2" );
+  CppUnit::Message message( expected, expected1, expected2 );
+  
+  CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() );
+  CPPUNIT_ASSERT_EQUAL( 2, message.detailCount() );
+  CPPUNIT_ASSERT_EQUAL( expected1, message.detailAt(0) );
+  CPPUNIT_ASSERT_EQUAL( expected2, message.detailAt(1) );
+}
+
+
+void 
+MessageTest::testConstructorDetail3()
+{
+  std::string expected( "short" );
+  std::string expected1( "detail-1" );
+  std::string expected2( "detail-2" );
+  std::string expected3( "detail-3" );
+  CppUnit::Message message( expected, expected1, expected2, expected3 );
+  
+  CPPUNIT_ASSERT_EQUAL( expected, message.shortDescription() );
+  CPPUNIT_ASSERT_EQUAL( 3, message.detailCount() );
+  CPPUNIT_ASSERT_EQUAL( expected1, message.detailAt(0) );
+  CPPUNIT_ASSERT_EQUAL( expected2, message.detailAt(1) );
+  CPPUNIT_ASSERT_EQUAL( expected3, message.detailAt(2) );
+}
+
+
+void 
+MessageTest::testDetailsNone()
+{
+  CPPUNIT_ASSERT_EQUAL( std::string(), m_message->details() );
+}
+
+
+void 
+MessageTest::testDetailsSome()
+{
+  m_message->addDetail( "Expected: 1", "Actual:   7", "Info: number" );
+  std::string expected( "- Expected: 1\n- Actual:   7\n- Info: number\n" );
+  std::string actual = m_message->details();
+  CPPUNIT_ASSERT_EQUAL( expected, actual );
+}
+
+
+void 
+MessageTest::testEqual()
+{
+  CPPUNIT_ASSERT( *m_message == CppUnit::Message() );
+  
+  CppUnit::Message message1( "short", "det1", "det2", "det3" );
+  CppUnit::Message message2( message1 );
+  CPPUNIT_ASSERT( message1 == message2 );
+
+  CPPUNIT_ASSERT( !(*m_message == message1) );
+
+  CppUnit::Message message3( "short" );
+  CPPUNIT_ASSERT( !(message3 == message1) );
+
+  CppUnit::Message message4( "long" );
+  CPPUNIT_ASSERT( !(message3 == message4) );
+
+  CppUnit::Message message5( "short", "det1", "det-2", "det3" );
+  CPPUNIT_ASSERT( !(message1 == message5) );
+}
+
+
+void 
+MessageTest::testNotEqual()
+{
+  CppUnit::Message message1( "short", "det1", "det2", "det3" );
+  CppUnit::Message message2( "short", "det1", "det-2", "det3" );
+  CPPUNIT_ASSERT( message1 != message2 );
+  CPPUNIT_ASSERT( !(message1 != message1) );
+}
diff --git a/examples/cppunittest/MessageTest.h b/examples/cppunittest/MessageTest.h
new file mode 100644
index 0000000..f21d8d4
--- /dev/null
+++ b/examples/cppunittest/MessageTest.h
@@ -0,0 +1,75 @@
+#ifndef MESSAGETEST_H
+#define MESSAGETEST_H
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/Message.h>
+
+
+/// Unit tests for MessageTest
+class MessageTest : public CppUnit::TestFixture
+{
+  CPPUNIT_TEST_SUITE( MessageTest );
+  CPPUNIT_TEST( testDefaultConstructor );
+  CPPUNIT_TEST_EXCEPTION( testDetailAtThrowIfBadIndex, std::invalid_argument );
+  CPPUNIT_TEST_EXCEPTION( testDetailAtThrowIfBadIndex2, std::invalid_argument );
+  CPPUNIT_TEST( testAddDetail );
+  CPPUNIT_TEST( testAddDetail2 );
+  CPPUNIT_TEST( testAddDetail3 );
+  CPPUNIT_TEST( testAddDetailEmptyMessage );
+  CPPUNIT_TEST( testAddDetailMessage );
+  CPPUNIT_TEST( testSetShortDescription );
+  CPPUNIT_TEST( testClearDetails );
+  CPPUNIT_TEST( testConstructor );
+  CPPUNIT_TEST( testConstructorDetail1 );
+  CPPUNIT_TEST( testConstructorDetail2 );
+  CPPUNIT_TEST( testConstructorDetail3 );
+  CPPUNIT_TEST( testDetailsNone );
+  CPPUNIT_TEST( testDetailsSome );
+  CPPUNIT_TEST( testEqual );
+  CPPUNIT_TEST( testNotEqual );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+  MessageTest();
+
+  virtual ~MessageTest();
+
+  void setUp();
+  void tearDown();
+
+  void testDefaultConstructor();
+  void testDetailAtThrowIfBadIndex();
+  void testDetailAtThrowIfBadIndex2();
+  void testAddDetail();
+  void testAddDetail2();
+  void testAddDetail3();
+  void testAddDetailEmptyMessage();
+  void testAddDetailMessage();
+  void testSetShortDescription();
+  void testClearDetails();
+
+  void testConstructor();
+  void testConstructorDetail1();
+  void testConstructorDetail2();
+  void testConstructorDetail3();
+
+  void testDetailsNone();
+  void testDetailsSome();
+
+  void testEqual();
+  void testNotEqual();
+
+private:
+  /// Prevents the use of the copy constructor.
+  MessageTest( const MessageTest &other );
+
+  /// Prevents the use of the copy operator.
+  void operator =( const MessageTest &other );
+
+private:
+  CppUnit::Message *m_message;
+};
+
+
+
+#endif  // MESSAGETEST_H
diff --git a/examples/cppunittest/NotEqualExceptionTest.cpp b/examples/cppunittest/NotEqualExceptionTest.cpp
index 43522fb..838ca6e 100644
--- a/examples/cppunittest/NotEqualExceptionTest.cpp
+++ b/examples/cppunittest/NotEqualExceptionTest.cpp
@@ -46,9 +46,12 @@ NotEqualExceptionTest::testConstructor()
   CPPUNIT_ASSERT_EQUAL( message, e.additionalMessage() );
   CPPUNIT_ASSERT( CppUnit::SourceLine( "f.cpp", 123) == e.sourceLine() );
 
-  std::string expectedMessage( "Expected: expectedValue, but was: actualValue.message" );
-  std::string actualMessage( e.what() );
-  CPPUNIT_ASSERT_EQUAL( expectedMessage, actualMessage );
+  CppUnit::Message expectedMessage( "equality assertion failed",
+                                    "Expected: " + expectedValue,
+                                    "Actual  : " + actualValue,
+                                    message );
+  CppUnit::Message actualMessage( e.message() );
+  CPPUNIT_ASSERT( expectedMessage == actualMessage );
 }
 
 
diff --git a/examples/cppunittest/TestCallerTest.cpp b/examples/cppunittest/TestCallerTest.cpp
index e5e5db9..626368b 100644
--- a/examples/cppunittest/TestCallerTest.cpp
+++ b/examples/cppunittest/TestCallerTest.cpp
@@ -19,7 +19,7 @@ TestCallerTest::ExceptionThrower::testThrowFailureException()
 void 
 TestCallerTest::ExceptionThrower::testThrowException()
 {
-  throw CppUnit::Exception( "expected Exception" );
+  throw CppUnit::Exception( CppUnit::Message( "expected Exception" ) );
 }
 
 
diff --git a/examples/cppunittest/TestFailureTest.h b/examples/cppunittest/TestFailureTest.h
index 52b5b13..8149a2e 100644
--- a/examples/cppunittest/TestFailureTest.h
+++ b/examples/cppunittest/TestFailureTest.h
@@ -28,7 +28,7 @@ private:
   {
   public:
     ObservedException( TestFailureTest *listener ) : 
-        CppUnit::Exception( "ObservedException" ),
+        CppUnit::Exception( CppUnit::Message("ObservedException" ) ),
         m_listener( listener )
     {
     }
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 );
 }
diff --git a/examples/cppunittest/TestResultCollectorTest.h b/examples/cppunittest/TestResultCollectorTest.h
index c900d3e..ad3f582 100644
--- a/examples/cppunittest/TestResultCollectorTest.h
+++ b/examples/cppunittest/TestResultCollectorTest.h
@@ -67,7 +67,7 @@ private:
                     int testsRun );
 
   void checkFailure( CppUnit::TestFailure *failure,
-                     std::string expectedMessage,
+                     CppUnit::Message expectedMessage,
                      CppUnit::Test *expectedTest,
                      bool expectedIsError );
 
diff --git a/examples/cppunittest/TestResultTest.cpp b/examples/cppunittest/TestResultTest.cpp
index 1fb6ad7..b43b1b0 100644
--- a/examples/cppunittest/TestResultTest.cpp
+++ b/examples/cppunittest/TestResultTest.cpp
@@ -54,7 +54,8 @@ TestResultTest::testStop()
 void 
 TestResultTest::testAddError()
 {
-  CppUnit::Exception *dummyException = new CppUnit::Exception( "some_error" );
+  CppUnit::Exception *dummyException = new CppUnit::Exception( 
+                                           CppUnit::Message( "some_error" ) );
   m_listener1->setExpectFailure( m_dummyTest, dummyException, true );
   m_result->addListener( m_listener1 );
 
@@ -67,7 +68,8 @@ TestResultTest::testAddError()
 void 
 TestResultTest::testAddFailure()
 {
-  CppUnit::Exception *dummyException = new CppUnit::Exception( "some_error" );
+  CppUnit::Exception *dummyException = new CppUnit::Exception( 
+                                            CppUnit::Message("some_error" ) );
   m_listener1->setExpectFailure( m_dummyTest, dummyException, false );
   m_result->addListener( m_listener1 );
 
@@ -143,7 +145,8 @@ TestResultTest::testTwoListener()
 {
   m_listener1->setExpectStartTest( m_dummyTest );
   m_listener2->setExpectStartTest( m_dummyTest );
-  CppUnit::Exception *dummyException1 = new CppUnit::Exception( "some_error" );
+  CppUnit::Exception *dummyException1 = new CppUnit::Exception( 
+                                             CppUnit::Message( "some_error" ) );
   m_listener1->setExpectFailure( m_dummyTest, dummyException1, true );
   m_listener2->setExpectFailure( m_dummyTest, dummyException1, true );
   m_listener1->setExpectEndTest( m_dummyTest );
diff --git a/examples/cppunittest/XmlOutputterTest.cpp b/examples/cppunittest/XmlOutputterTest.cpp
index e3149ae..6e08d7d 100644
--- a/examples/cppunittest/XmlOutputterTest.cpp
+++ b/examples/cppunittest/XmlOutputterTest.cpp
@@ -234,7 +234,7 @@ XmlOutputterTest::addTestFailure( std::string testName,
                                   std::string message,
                                   CppUnit::SourceLine sourceLine )
 {
-  addGenericTestFailure( testName, message, sourceLine, false );
+  addGenericTestFailure( testName, CppUnit::Message(message), sourceLine, false );
 }
 
 
@@ -243,13 +243,13 @@ XmlOutputterTest::addTestError( std::string testName,
                                 std::string message,
                                 CppUnit::SourceLine sourceLine )
 {
-  addGenericTestFailure( testName, message, sourceLine, true );
+  addGenericTestFailure( testName, CppUnit::Message(message), sourceLine, true );
 }
 
 
 void 
 XmlOutputterTest::addGenericTestFailure(  std::string testName,
-                                          std::string message,
+                                          CppUnit::Message message,
                                           CppUnit::SourceLine sourceLine,
                                           bool isError )
 {
diff --git a/examples/cppunittest/XmlOutputterTest.h b/examples/cppunittest/XmlOutputterTest.h
index 344cd3a..9f155e2 100644
--- a/examples/cppunittest/XmlOutputterTest.h
+++ b/examples/cppunittest/XmlOutputterTest.h
@@ -57,7 +57,7 @@ private:
                      std::string message,
                      CppUnit::SourceLine sourceLine = CppUnit::SourceLine() );
   void addGenericTestFailure( std::string testName,
-                              std::string message,
+                              CppUnit::Message message,
                               CppUnit::SourceLine sourceLine,
                               bool isError );