From abd178318ae3cdb6cc0a700e77414a33ef9297ca Mon Sep 17 00:00:00 2001
From: Baptiste Lepilleur <gaiacrtn@free.fr>
Date: Thu, 13 Jun 2002 14:31:01 +0000
Subject: 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.
---
 examples/cppunittest/ExceptionTest.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'examples/cppunittest/ExceptionTest.cpp')

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() ) );
 }
-- 
cgit v1.2.1