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.

1 files changed, 33 insertions, 23 deletions

diff --git a/include/cppunit/NotEqualException.h b/include/cppunit/NotEqualException.h
index f538222..ba48dbb 100644
--- a/include/cppunit/NotEqualException.h
+++ b/include/cppunit/NotEqualException.h
@@ -7,39 +7,49 @@
 namespace CppUnit {
 
 
-  class NotEqualException : public Exception
-  {
-  public:
-    NotEqualException( std::string expected,
-                       std::string actual, 
-                       long lineNumber = UNKNOWNLINENUMBER, 
-                       std::string fileName = UNKNOWNFILENAME );
+class NotEqualException : public Exception
+{
+public:
+  NotEqualException( std::string expected,
+                     std::string actual, 
+                     SourceLine sourceLine = SourceLine(),
+                     std::string additionalMessage = "" );
 
-    NotEqualException( const NotEqualException &other );
+#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED
+  NotEqualException( std::string expected,
+                     std::string actual, 
+                     long lineNumber, 
+                     std::string fileName );
+#endif
 
+  NotEqualException( const NotEqualException &other );
 
-    virtual ~NotEqualException() throw();
 
-    std::string expectedValue() const;
+  virtual ~NotEqualException() throw();
 
-    std::string actualValue() const;
+  std::string expectedValue() const;
 
-    /*! Copy operator.
-     * @param other Object to copy.
-     * @return Reference on this object.
-     */
-    NotEqualException &operator =( const NotEqualException &other );
+  std::string actualValue() const;
 
-    Exception *clone() const;
+  std::string additionalMessage() const;
 
-    bool isInstanceOf( const Type &type ) const;
+  /*! Copy operator.
+   * @param other Object to copy.
+   * @return Reference on this object.
+   */
+  NotEqualException &operator =( const NotEqualException &other );
 
-    static Type type();
+  Exception *clone() const;
 
-  private:
-    std::string m_expected;
-    std::string m_actual;
-  };
+  bool isInstanceOf( const Type &type ) const;
+
+  static Type type();
+
+private:
+  std::string m_expected;
+  std::string m_actual;
+  std::string m_additionalMessage;
+};
 
 }  // namespace CppUnit