Include/cppunit/CompilerTestResultOutputter.

include/cppunit/CompilerTestResultOutputter.h :
renamed CompilerOutputter.h

* src/cppunit/CompilerTestResultOutputter.cpp :
renamed CompilerOutputter.cpp

* include/cppunit/CompilerTestResultOutputter.h :
* src/cppunit/CompilerTestResultOutputter.cpp : ajust max line length
for wrapping. Added static factory method defaultOutputter(). Print
the number of test runs on success.

* include/cppunit/CompilerTestResultOutputter.h : renamed
CompilerOutputter.h.

* src/cppunit/CompilerTestResultOutputter.cpp : renamed
CompilerOutputter.cpp.

* examples/cppunittest/CppUnitTestMain.cpp : use factory method
CompilerTestResultOutputter::defaultOutputter().

* src/msvc6/DSPlugIn/DSPlugIn.dsp : removed COM registration in
post-build step. IT is automatically done by VC++ when the add-in is
added. Caused build to failed if the add-in was used in VC++.

* NEWS : updated.

* src/cppunit/TestAssert.cpp : modified deprecated assert
implementations to use Asserter.

* examples/cppunittest/XmlTestResultOutputterTest.h :
renamed XmlOutputterTest.h.

* examples/cppunittest/XmlTestResultOutputterTest.cpp :
renamed XmlOutputterTest.cpp.

* NEWS :
* examples/cppunittest/CppUnitTestMain.cpp :
* examples/cppunittest/CppUnitTestMain.dsp :
* examples/cppunittest/Makefile.am :
* examples/cppunittest/XmlTestResultOutputterTest.h :
* examples/cppunittest/XmlTestResultOutputterTest.cpp :
* examples/msvc6/CppUniTestApp/CppUnitTestApp.dsp
* include/cppunit/CompilerOutputter.h :
* include/cppunit/Makefile.am :
* include/cppunit/XmlTestResultOutputter.h :
* src/cppunit/CompilerOutputter.cpp :
* src/cppunit/cppunit.dsp :
* src/cppunit/Makefile.am :
* src/cppunit/XmlTestResultOutputter.cpp : change due to renaming
CompilerTestResultOutputter to CompilerOutputter,
XmlTestResultOutputter to XmlOuputter, XmlTestResultOutputterTest
to XmlOutputterTest.

3 files changed, 43 insertions, 35 deletions

diff --git a/include/cppunit/CompilerTestResultOutputter.h b/include/cppunit/CompilerOutputter.h
index 8c4514c..9f4840b 100644
--- a/include/cppunit/CompilerTestResultOutputter.h
+++ b/include/cppunit/CompilerOutputter.h
@@ -13,19 +13,22 @@ class Test;
 class TestFailure;
 class TestResult;
 
-/*! \class CompilerTestResultOutputter
+/*! \class CompilerOutputter
  * \brief This class implements output test result in a compiler compatible format.
  */
-class CompilerTestResultOutputter
+class CompilerOutputter
 {
 public:
-  /*! Constructs a CompilerTestResultOutputter object.
+  /*! Constructs a CompilerOutputter object.
    */
-  CompilerTestResultOutputter( TestResult *result,
+  CompilerOutputter( TestResult *result,
                                std::ostream &stream );
 
   /// Destructor.
-  virtual ~CompilerTestResultOutputter();
+  virtual ~CompilerOutputter();
+
+  static CompilerOutputter *defaultOutputter( TestResult *result,
+                                                        std::ostream &stream );
 
   virtual void write( );
 
@@ -44,10 +47,10 @@ public:
 
 private:
   /// Prevents the use of the copy constructor.
-  CompilerTestResultOutputter( const CompilerTestResultOutputter &copy );
+  CompilerOutputter( const CompilerOutputter &copy );
 
   /// Prevents the use of the copy operator.
-  void operator =( const CompilerTestResultOutputter &copy );
+  void operator =( const CompilerOutputter &copy );
 
 private:
   TestResult *m_result;
diff --git a/include/cppunit/Makefile.am b/include/cppunit/Makefile.am
index 9e224a5..99dfa65 100644
--- a/include/cppunit/Makefile.am
+++ b/include/cppunit/Makefile.am
@@ -8,7 +8,7 @@ libcppunitinclude_HEADERS =  \
 	config-msvc6.h \
 	config-bcb5.h \
 	Asserter.h \
-	CompilerTestResultOutputter.h \
+	CompilerOutputter.h \
 	Exception.h \
 	NotEqualException.h \
 	Portability.h \
@@ -24,4 +24,4 @@ libcppunitinclude_HEADERS =  \
 	TextTestResult.h \
 	TextTestRunner.h \
 	TestListener.h \
-	XmlTestResultOutputter.h
+	XmlOutputter.h
diff --git a/include/cppunit/XmlTestResultOutputter.h b/include/cppunit/XmlOutputter.h
index 211ce02..6aeed92 100644
--- a/include/cppunit/XmlTestResultOutputter.h
+++ b/include/cppunit/XmlOutputter.h
@@ -18,26 +18,26 @@ class TestResult;
 
 /*! This class ouputs a TestResult in XML format.
  */
-class XmlTestResultOutputter
+class XmlOutputter
 {
 public:
-  /*! Constructs a XmlTestResultOutputter object.
+  /*! Constructs a XmlOutputter object.
    */
-  XmlTestResultOutputter();
+  XmlOutputter( TestResult *result,
+                          std::ostream &stream );
 
   /// Destructor.
-  virtual ~XmlTestResultOutputter();
+  virtual ~XmlOutputter();
 
   /*! Write the specified result as an XML document in the specified stream.
    *
-   * Refer to examples/cppunittest/XmlTestResultOutputterTest.cpp for example
+   * Refer to examples/cppunittest/XmlOutputterTest.cpp for example
    * of use and XML document structure.
    *
    * \param result TestResult to write.
    * \param stream Output stream the result are wrote into.
    */
-  void write( TestResult *result,
-              std::ostream &stream );
+  virtual void write();
 
   /*! This class represents an XML Element.
    * \warning This class will probably be replaced with an abstract
@@ -77,33 +77,38 @@ public:
   };
 
 
-  virtual void writeProlog( std::ostream &stream );
-  virtual void writeTestsResult( TestResult *result, 
-                                 std::ostream &stream );
+  virtual void writeProlog();
+  virtual void writeTestsResult();
 
   typedef std::map<Test *,TestFailure*> FailedTests;
-  virtual Node *makeRootNode( TestResult *result );
-  virtual Node *makeFailedTestsNode( FailedTests &failedTests, 
-                                     TestResult *result );
-  virtual Node *makeSucessfulTestsNode( FailedTests &failedTests, 
-                                        TestResult *result );
-  virtual Node *makeStatisticsNode( TestResult *result );
-  virtual Node *makeFailedTestNode( Test *test,
-                                    TestFailure *failure,
-                                    int testNumber );
-  virtual Node *makeFailureLocationNode( TestFailure *failure );
-  virtual Node *makeSucessfulTestNode( Test *test, 
-                                       int testNumber );
+  virtual Node *makeRootNode();
+  virtual void addFailedTests( FailedTests &failedTests,
+                               Node *rootNode );
+  virtual void addSucessfulTests( FailedTests &failedTests,
+                                  Node *rootNode );
+  virtual void addStatistics( Node *rootNode );
+  virtual void addFailedTest( Test *test,
+                              TestFailure *failure,
+                              int testNumber,
+                              Node *testsNode );
+  virtual void addFailureLocation( TestFailure *failure,
+                                   Node *testNode );
+  virtual void addSucessfulTest( Test *test, 
+                                 int testNumber,
+                                 Node *testsNode );
 protected:
-  void fillFailedTestsMap( TestResult *result, 
-                           FailedTests &failedTests );
+  virtual void fillFailedTestsMap( FailedTests &failedTests );
+
+protected:
+  TestResult *m_result;
+  std::ostream &m_stream;
 
 private:
   /// Prevents the use of the copy constructor.
-  XmlTestResultOutputter( const XmlTestResultOutputter &copy );
+  XmlOutputter( const XmlOutputter &copy );
 
   /// Prevents the use of the copy operator.
-  void operator =( const XmlTestResultOutputter &copy );
+  void operator =( const XmlOutputter &copy );
 
 private:
 };