Include/cppunit/NotEqualException.

include/cppunit/NotEqualException.h
* src/cppunit/NotEqualException.h:
Fixed constructor and operator = (aren't unit test nice?). Added
methods expectedValue() and actualValue().

* include/cppunit/TestAssert.h:
* src/cppunit/TestAssert.cpp:
Use NotEqualException to report equality failure.

* src/cppunit/TestResult.cpp:
Report expect/was on different line for assertEquals failure.

* examples/cppunittest/NotEqualExceptionTest.*: added unit tests for
NotEqualException.

1 files changed, 20 insertions, 2 deletions

diff --git a/src/cppunit/NotEqualException.cpp b/src/cppunit/NotEqualException.cpp
index 2fe9e76..1615c2b 100644
--- a/src/cppunit/NotEqualException.cpp
+++ b/src/cppunit/NotEqualException.cpp
@@ -7,9 +7,11 @@ NotEqualException::NotEqualException( std::string expected,
                                       std::string actual,
                                       long lineNumber, 
                                       std::string fileName ) : 
-    Exception( "Expected: " + expected + ", but was:" + actual,
+    Exception( "Expected: " + expected + ", but was: " + actual,
                lineNumber,
-               fileName )
+               fileName ),
+    m_expected( expected ),
+    m_actual( actual )
 {
 }
 
@@ -30,6 +32,8 @@ NotEqualException::~NotEqualException()
 NotEqualException &
 NotEqualException::operator =( const NotEqualException &other )
 {
+  Exception::operator =( other );
+
   if ( &other != this )
   {
     m_expected = other.m_expected;
@@ -61,4 +65,18 @@ NotEqualException::type()
 }
 
 
+std::string 
+NotEqualException::expectedValue() const
+{
+  return m_expected;
+}
+
+
+std::string 
+NotEqualException::actualValue() const
+{
+  return m_actual;
+}
+
+
 }  //  namespace CppUnit