Include/cppunit/NotEqualException.

include/cppunit/NotEqualException.h:
* src/cppunit/NotEqualException.cpp: removed.

* include/cppunit/Exception.h:
* src/cppunit/Exception.cpp: removed 'type' related stuffs.

* include/cppunit/TextTestResult.h:
* src/cppunit/TextTestResult.cpp: delegate printing to TextOutputter.

* examples/simple/ExampleTestCase.h:
* examples/simple/ExampleTestCase.cpp: reindented.

* src/qttestrunner/build:
* src/qttestrunner/qttestrunner.pro:
* src/qttestrunner/TestBrowserDlgImpl.h:
* src/qttestrunner/TestRunnerModel.h: applied Thomas Neidhart's patch,
'Some minor fixes to compile QTTestrunner under Linux.'.

1 files changed, 3 insertions, 130 deletions

diff --git a/src/cppunit/TextTestResult.cpp b/src/cppunit/TextTestResult.cpp
index a8483b7..918b620 100644
--- a/src/cppunit/TextTestResult.cpp
+++ b/src/cppunit/TextTestResult.cpp
@@ -1,8 +1,8 @@
 #include <cppunit/Exception.h>
-#include <cppunit/NotEqualException.h>
 #include <cppunit/Test.h>
 #include <cppunit/TestFailure.h>
 #include <cppunit/TextTestResult.h>
+#include <cppunit/TextOutputter.h>
 #include <iostream>
 
 
@@ -32,137 +32,10 @@ TextTestResult::startTest( Test *test )
 
 
 void 
-TextTestResult::printFailures( std::ostream &stream )
-{
-  TestFailures::const_iterator itFailure = failures().begin();
-  int failureNumber = 1;
-  while ( itFailure != failures().end() ) 
-  {
-    stream  <<  std::endl;
-    printFailure( *itFailure++, failureNumber++, stream );
-  }
-}
-
-
-void 
-TextTestResult::printFailure( TestFailure *failure,
-                              int failureNumber,
-                              std::ostream &stream )
-{
-  printFailureListMark( failureNumber, stream );
-  stream << ' ';
-  printFailureTestName( failure, stream );
-  stream << ' ';
-  printFailureType( failure, stream );
-  stream << ' ';
-  printFailureLocation( failure->sourceLine(), stream );
-  stream << std::endl;
-  printFailureDetail( failure->thrownException(), stream );
-  stream << std::endl;
-}
-
-
-void 
-TextTestResult::printFailureListMark( int failureNumber,
-                                      std::ostream &stream )
-{
-  stream << failureNumber << ")";
-}
-
-
-void 
-TextTestResult::printFailureTestName( TestFailure *failure,
-                                      std::ostream &stream )
-{
-  stream << "test: " << failure->failedTest()->getName();
-}
-
-
-void 
-TextTestResult::printFailureType( TestFailure *failure,
-                                  std::ostream &stream )
-{
-  stream << "("
-         << (failure->isError() ? "E" : "F")
-         << ")";
-}
-
-
-void 
-TextTestResult::printFailureLocation( SourceLine sourceLine,
-                                      std::ostream &stream )
-{
-  if ( !sourceLine.isValid() )
-    return;
-
-  stream << "line: " << sourceLine.lineNumber()
-         << ' ' << sourceLine.fileName();
-}
-
-
-void 
-TextTestResult::printFailureDetail( Exception *thrownException,
-                                    std::ostream &stream )
-{
-  if ( thrownException->isInstanceOf( NotEqualException::type() ) )
-  {
-    NotEqualException *e = (NotEqualException*)thrownException;
-    stream << "expected: " << e->expectedValue() << std::endl
-           << "but was:  " << e->actualValue();
-    if ( !e->additionalMessage().empty() )
-    {
-      stream  << std::endl;
-      stream  <<  "additional message:"  <<  std::endl
-              <<  e->additionalMessage();
-    }
-  }
-  else
-  {
-    stream << " \"" << thrownException->what() << "\"";
-  }
-}
-
-
-void 
 TextTestResult::print( std::ostream& stream ) 
 {
-  printHeader( stream );
-  stream << std::endl;
-  printFailures( stream );
-}
-
-
-void 
-TextTestResult::printHeader( std::ostream &stream )
-{
-  if (wasSuccessful ())
-    stream << std::endl << "OK (" << runTests () << " tests)" 
-           << std::endl;
-  else
-  {
-    stream << std::endl;
-    printFailureWarning( stream );
-    printStatistics( stream );
-  }
-}
-
-
-void 
-TextTestResult::printFailureWarning( std::ostream &stream )
-{
-  stream  << "!!!FAILURES!!!" << std::endl;
-}
-
-
-void 
-TextTestResult::printStatistics( std::ostream &stream )
-{
-  stream  << "Test Results:" << std::endl;
-
-  stream  <<  "Run:  "  <<  runTests()
-          <<  "   Failures: "  <<  testFailures()
-          <<  "   Errors: "  <<  testErrors()
-          <<  std::endl;
+  TextOutputter outputter( this, stream );
+  outputter.write();
 }