From fbd454f554f13680fe62b36fb7a5829f6dc0c396 Mon Sep 17 00:00:00 2001
From: Baptiste Lepilleur <gaiacrtn@free.fr>
Date: Fri, 5 Oct 2001 21:27:15 +0000
Subject: Include/cppunit/Asserter.

include/cppunit/Asserter.h :
* src/cppunit/Asserter.cpp : added. Helper to create assertion macros.

* src/cppunit/cppunit.dsp :
* src/cppunit/Makefile.am :
* include/cppunit/Makefile.am : added Asserter.h and Asserter.cpp.

* include/cppunit/Exception.h :
* src/cppunit/Exception.cpp : added constructor that take a
SourceLine argument. Deprecated static constant and old constructor.
Fixed some constness issues.

* examples/cppunittest/ExceptionTest.cpp : Refactored.

* NEWS : partially updated (need to be more detailed)

* include/cppunit/NotEqualException.h :
* src/cppunit/NotEqualException.cpp : added constructor that take a
SourceLine argument. Deprecated old constructor. Added a third element
to compose message.

* examples/cppunittest/NotEqualExceptionTest.cpp : moved to "Core"
suite. Added test for SourceLine() and additionalMessage().
Refactored.

* include/cppunit/SourceLine.h :
* src/cppunit/SourceLine.cpp : added. Result of applying
IntroduceParameterObject refactoring on filename & line number...

* include/cppunit/TestAssert.h :
* src/cppunit/TestAssert.cpp : deprecated old assert functions.
added functions assertEquals() and assertDoubleEquals() which use
SourceLine.

* src/cppunit/TestCase.cpp : Modified for SourceLine.

* include/cppunit/TestFailure.h :
* src/cppunit/TestFailure.cpp : added failedTestName(), and
sourceLine().

* src/msvc6/testrunner/TestRunnerDlg.cpp : modified to use SourceLine.

* include/cppunit/TextTestResult.h :
* src/cppunit/TextTestResult.cpp : corrected include order and
switched to angled brackets. Refactored. Don't print failure location
if not available. Not equal failure dump additional message if
available.

* src/cppunit/TextTestRunner.cpp : run() now returns a boolean to
indicate if the run was sucessful.

* src/cppunit/XmlTestResultOutputter.cpp : replaced itoa() with
OStringStream. Refactored.

* examples/cppunittest/XmlUniformiser.h :
* examples/cppunittest/XmlUniformiser.cpp :
CPPUNITTEST_ASSERT_XML_EQUAL capture failure location. Refactored
checkXmlEqual().

* examples/cppunittest/XmlUniformiserTest.h :
* examples/cppunittest/XmlUniformiserTest.cpp : added test for
CPPUNITTEST_ASSERT_XML_EQUAL.

* include/cppunit/XmlTestResultOutputter.h :
* src/cppunit/XmlTestResultOutputter.cpp : updated to use SourceLine.
---
 src/cppunit/NotEqualException.cpp | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

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

diff --git a/src/cppunit/NotEqualException.cpp b/src/cppunit/NotEqualException.cpp
index 1711c0d..738961d 100644
--- a/src/cppunit/NotEqualException.cpp
+++ b/src/cppunit/NotEqualException.cpp
@@ -3,6 +3,25 @@
 namespace CppUnit {
 
 
+NotEqualException::NotEqualException( std::string expected,
+                                      std::string actual, 
+                                      SourceLine sourceLine ,
+                                      std::string additionalMessage ) :
+    Exception( "Expected: " + expected + 
+                   ", but was: " + actual + 
+                   "." + additionalMessage ,
+               sourceLine),
+    m_expected( expected ),
+    m_actual( actual ),
+    m_additionalMessage( additionalMessage )
+{
+}
+
+
+#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED
+/*!
+ * \deprecated Use other constructor instead.
+ */
 NotEqualException::NotEqualException( std::string expected,
                                       std::string actual,
                                       long lineNumber, 
@@ -14,12 +33,14 @@ NotEqualException::NotEqualException( std::string expected,
     m_actual( actual )
 {
 }
+#endif
 
 
 NotEqualException::NotEqualException( const NotEqualException &other ) : 
     Exception( other ),
     m_expected( other.m_expected ),
-    m_actual( other.m_actual )
+    m_actual( other.m_actual ),
+    m_additionalMessage( other.m_additionalMessage )
 {
 }
 
@@ -38,6 +59,7 @@ NotEqualException::operator =( const NotEqualException &other )
   {
     m_expected = other.m_expected;
     m_actual = other.m_actual;
+    m_additionalMessage = other.m_additionalMessage;
   }
   return *this;
 }
@@ -79,4 +101,11 @@ NotEqualException::actualValue() const
 }
 
 
+std::string 
+NotEqualException::additionalMessage() const
+{
+  return m_additionalMessage;
+}
+
+
 }  //  namespace CppUnit
-- 
cgit v1.2.1