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.
---
 src/cppunit/TestCase.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/cppunit/TestCase.cpp')

diff --git a/src/cppunit/TestCase.cpp b/src/cppunit/TestCase.cpp
index 4fb388a..3ab0fbe 100644
--- a/src/cppunit/TestCase.cpp
+++ b/src/cppunit/TestCase.cpp
@@ -36,10 +36,11 @@ TestCase::run( TestResult *result )
       result->addFailure( this, copy );
     }
     catch ( std::exception &e ) {
-      result->addError( this, new Exception( e.what() ) );
+      result->addError( this, new Exception( Message( "uncaught std::exception", 
+                                                      e.what() ) ) );
     }
     catch (...) {
-      Exception *e = new Exception( "caught unknown exception" );
+      Exception *e = new Exception( Message( "uncaught unknown exception" ) );
       result->addError( this, e );
     }
 
@@ -47,11 +48,11 @@ TestCase::run( TestResult *result )
       tearDown();
     }
     catch (...) {
-      result->addError( this, new Exception( "tearDown() failed" ) );
+      result->addError( this, new Exception( Message( "tearDown() failed" ) ) );
     }
   }
   catch (...) {
-          result->addError( this, new Exception( "setUp() failed" ) );
+    result->addError( this, new Exception( Message( "setUp() failed" ) ) );
   }
   
   result->endTest( this );
-- 
cgit v1.2.1