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, 38 insertions, 6 deletions

diff --git a/src/cppunit/Asserter.cpp b/src/cppunit/Asserter.cpp
index 29c5201..659e328 100644
--- a/src/cppunit/Asserter.cpp
+++ b/src/cppunit/Asserter.cpp
@@ -1,4 +1,5 @@
 #include <cppunit/Asserter.h>
+#include <cppunit/Message.h>
 #include <cppunit/NotEqualException.h>
 
 
@@ -12,7 +13,15 @@ namespace Asserter
 
 void 
 fail( std::string message, 
-      SourceLine sourceLine )
+      const SourceLine &sourceLine )
+{
+  fail( Message( "assertion failed", message ), sourceLine );
+}
+
+
+void 
+fail( const Message &message, 
+      const SourceLine &sourceLine )
 {
   throw Exception( message, sourceLine );
 }
@@ -20,18 +29,41 @@ fail( std::string message,
 
 void 
 failIf( bool shouldFail, 
-        std::string message, 
-        SourceLine location )
+        const Message &message, 
+        const SourceLine &sourceLine )
 {
   if ( shouldFail )
-    fail( message, location );
+    fail( message, sourceLine );
+}
+
+
+void 
+failIf( bool shouldFail, 
+        std::string message, 
+        const SourceLine &sourceLine )
+{
+  failIf( shouldFail, Message( "assertion failed", message ), sourceLine );
 }
 
+/* @@fixme Need to take NotEqualException down before including that change.
+void 
+failNotEqual( std::string expected, 
+              std::string actual, 
+              const SourceLine &sourceLine,
+              const Message &additionalMessage )
+{
+  Message message( "equality assertion failed",
+                   "Expected: " + expected,
+                   "Actual  : " + actual );
+  message.addDetail( additionalMessage );
+  fail( message, sourceLine );
+}
+*/
 
 void 
 failNotEqual( std::string expected, 
               std::string actual, 
-              SourceLine sourceLine,
+              const SourceLine &sourceLine,
               std::string additionalMessage )
 {
   throw NotEqualException( expected, 
@@ -45,7 +77,7 @@ void
 failNotEqualIf( bool shouldFail,
                 std::string expected, 
                 std::string actual, 
-                SourceLine sourceLine,
+                const SourceLine &sourceLine,
                 std::string additionalMessage )
 {
   if ( shouldFail )