Include/cppunit/TestFailure.

include/cppunit/TestFailure.cpp :
* include/cppunit/TestFailure.h : fixed some constness issues. Added
argument to indicate the type of failure to constructor. Added
isError().

* include/cppunit/TestListener.h : removed addError(). addFailure()
now take a TestFailure as argument.

* include/cppunit/TestResult.h :
* include/cppunit/TestResult.cpp : removed errors(). Refactored. Fixed
some constness issues. Added typedef TestFailures for vector returned
by failures(). failures() returns a const reference on the list of
failure. added testFailuresTotal(). Constructor can take an optional
synchronization object.

* include/cppunit/TextTestResult.h :
* include/cppunit/TextTestResult.cpp : removed printErrors().
Refactored. Updated to suit new TestResult, errors and failures are
reported in the same list.

* examples/cppunittest/TestFailureTest.cpp :
* examples/cppunittest/TestFailureTest.h : modified to use the new
TestFailure constructor. Added one test.

* examples/cppunittest/TestListenerTest.cpp: removed addError().
Refactored to suit new TestListener.

* examples/cppunittest/TestResultTest.h :
* examples/cppunittest/TestResultTest.cpp : modified to suit the
new TestResult.

6 files changed, 44 insertions, 37 deletions

diff --git a/examples/cppunittest/TestFailureTest.cpp b/examples/cppunittest/TestFailureTest.cpp
index 8e52268..d48f286 100644
--- a/examples/cppunittest/TestFailureTest.cpp
+++ b/examples/cppunittest/TestFailureTest.cpp
@@ -36,7 +36,17 @@ TestFailureTest::testConstructorAndGetters()
 {
   CppUnit::TestCase test;
   CppUnit::Exception *error = new ObservedException( this );
-  checkTestFailure( &test, error );
+  checkTestFailure( &test, error, false );
+  CPPUNIT_ASSERT( m_exceptionDestroyed );
+}
+
+
+void 
+TestFailureTest::testConstructorAndGettersForError()
+{
+  CppUnit::TestCase test;
+  CppUnit::Exception *error = new ObservedException( this );
+  checkTestFailure( &test, error, true );
   CPPUNIT_ASSERT( m_exceptionDestroyed );
 }
 
@@ -50,9 +60,11 @@ TestFailureTest::exceptionDestroyed()
 
 void 
 TestFailureTest::checkTestFailure( CppUnit::Test *test, 
-                                   CppUnit::Exception *error )
+                                   CppUnit::Exception *error,
+                                   bool isError )
 {
-  CppUnit::TestFailure failure( test, error );
+  CppUnit::TestFailure failure( test, error, isError );
   CPPUNIT_ASSERT_EQUAL( test, failure.failedTest() );
   CPPUNIT_ASSERT_EQUAL( error, failure.thrownException() );
+  CPPUNIT_ASSERT_EQUAL( isError, failure.isError() );
 }
diff --git a/examples/cppunittest/TestFailureTest.h b/examples/cppunittest/TestFailureTest.h
index a34cd27..f3aaf4b 100644
--- a/examples/cppunittest/TestFailureTest.h
+++ b/examples/cppunittest/TestFailureTest.h
@@ -8,6 +8,7 @@ class TestFailureTest : public CppUnit::TestCase
 {
   CPPUNIT_TEST_SUITE( TestFailureTest );
   CPPUNIT_TEST( testConstructorAndGetters );
+  CPPUNIT_TEST( testConstructorAndGettersForError );
   CPPUNIT_TEST_SUITE_END();
 
 public:
@@ -18,6 +19,7 @@ public:
   virtual void tearDown();
 
   void testConstructorAndGetters();
+  void testConstructorAndGettersForError();
 
   void exceptionDestroyed();
 
@@ -43,7 +45,8 @@ private:
   TestFailureTest( const TestFailureTest &copy );
   void operator =( const TestFailureTest &copy );
   void checkTestFailure( CppUnit::Test *test, 
-                         CppUnit::Exception *error );
+                         CppUnit::Exception *error,
+                         bool isError );
 
 private:
   bool m_exceptionDestroyed;
diff --git a/examples/cppunittest/TestListenerTest.cpp b/examples/cppunittest/TestListenerTest.cpp
index 112c988..b7d0e68 100644
--- a/examples/cppunittest/TestListenerTest.cpp
+++ b/examples/cppunittest/TestListenerTest.cpp
@@ -66,23 +66,16 @@ TestListenerTest::tearDown()
 
 
 void 
-TestListenerTest::addError( CppUnit::Test *test, CppUnit::Exception *e )
+TestListenerTest::addFailure( CppUnit::TestFailure *failure )
 {
-  m_listenerTest = test;
-  m_listenerError = e;
-  m_listenerCallbackType = onAddError;
+  m_listenerTest = failure->failedTest();
+  m_listenerError = failure->thrownException();
+  m_listenerCallbackType = failure->isError() ? onAddError : 
+                                                onAddFailure;
 }
 
 
 void 
-TestListenerTest::addFailure( CppUnit::Test *test, CppUnit::Exception *e )
-{
-  m_listenerTest = test;
-  m_listenerError = e;
-  m_listenerCallbackType = onAddFailure;
-}
-
-void 
 TestListenerTest::startTest( CppUnit::Test *test )
 {
   m_listenerTest = test;
diff --git a/examples/cppunittest/TestListenerTest.h b/examples/cppunittest/TestListenerTest.h
index 96a2e25..6b0ac32 100644
--- a/examples/cppunittest/TestListenerTest.h
+++ b/examples/cppunittest/TestListenerTest.h
@@ -39,10 +39,9 @@ private:
     onEndTest
   };
 
-  virtual void addError( CppUnit::Test *test, CppUnit::Exception *e );
-  virtual void addFailure( CppUnit::Test *test, CppUnit::Exception *e );
-  virtual void startTest( CppUnit::Test *test );
-  virtual void endTest( CppUnit::Test *test );
+  void addFailure( CppUnit::TestFailure *failure );
+  void startTest( CppUnit::Test *test );
+  void endTest( CppUnit::Test *test );
 
   CppUnit::Exception *makeDummyError();
 
diff --git a/examples/cppunittest/TestResultTest.cpp b/examples/cppunittest/TestResultTest.cpp
index 664dca5..aa9175e 100644
--- a/examples/cppunittest/TestResultTest.cpp
+++ b/examples/cppunittest/TestResultTest.cpp
@@ -70,12 +70,14 @@ TestResultTest::testAddTwoErrors()
   std::string errorMessage2( "Second Error" );
   m_result->addError( m_test2, new CppUnit::Exception( errorMessage2 ) );
   checkResult( 0, 2, 0 );
-  checkFailure( m_result->errors()[0],
+  checkFailure( m_result->failures()[0],
                 errorMessage1,
-                m_test );
-  checkFailure( m_result->errors()[1],
+                m_test,
+                true );
+  checkFailure( m_result->failures()[1],
                 errorMessage2,
-                m_test2 );
+                m_test2,
+                true );
 }
 
 
@@ -90,10 +92,12 @@ TestResultTest::testAddTwoFailures()
   checkResult( 2, 0, 0 );
   checkFailure( m_result->failures()[0],
                 errorMessage1,
-                m_test );
+                m_test,
+                false );
   checkFailure( m_result->failures()[1],
                 errorMessage2,
-                m_test2 );
+                m_test2,
+                false );
 }
 
 
@@ -215,14 +219,6 @@ TestResultTest::testSynchronizationTestFailures()
 
 
 void 
-TestResultTest::testSynchronizationErrors()
-{
-  m_synchronizedResult->errors();
-  checkSynchronization();
-}
-
-
-void 
 TestResultTest::testSynchronizationFailures()
 {
   m_synchronizedResult->failures();
@@ -262,17 +258,21 @@ TestResultTest::checkResult( int failures,
   CPPUNIT_ASSERT_EQUAL( testsRun, m_result->runTests() );
   CPPUNIT_ASSERT_EQUAL( errors, m_result->testErrors() );
   CPPUNIT_ASSERT_EQUAL( failures, m_result->testFailures() );
+  CPPUNIT_ASSERT_EQUAL( errors + failures, 
+                        m_result->testFailuresTotal() );
 }
 
 
 void
 TestResultTest::checkFailure( CppUnit::TestFailure *failure,
                               std::string expectedMessage,
-                              CppUnit::Test *expectedTest )
+                              CppUnit::Test *expectedTest,
+                              bool expectedIsError )
 {
   std::string actualMessage( failure->thrownException()->what() );
   CPPUNIT_ASSERT_EQUAL( expectedMessage, actualMessage );
   CPPUNIT_ASSERT_EQUAL( expectedTest, failure->failedTest() );
+  CPPUNIT_ASSERT_EQUAL( expectedIsError, failure->isError() );
 }
 
 
diff --git a/examples/cppunittest/TestResultTest.h b/examples/cppunittest/TestResultTest.h
index d27b402..dea50c4 100644
--- a/examples/cppunittest/TestResultTest.h
+++ b/examples/cppunittest/TestResultTest.h
@@ -27,7 +27,6 @@ class TestResultTest : public CppUnit::TestCase,
   CPPUNIT_TEST( testSynchronizationRunTests );
   CPPUNIT_TEST( testSynchronizationTestErrors );
   CPPUNIT_TEST( testSynchronizationTestFailures );
-  CPPUNIT_TEST( testSynchronizationErrors );
   CPPUNIT_TEST( testSynchronizationFailures );
   CPPUNIT_TEST( testSynchronizationWasSuccessful );
   CPPUNIT_TEST( testSynchronizationShouldStop );
@@ -82,7 +81,8 @@ private:
 
   void checkFailure( CppUnit::TestFailure *failure,
                      std::string expectedMessage,
-                     CppUnit::Test *expectedTest );
+                     CppUnit::Test *expectedTest,
+                     bool expectedIsError );
 
   void checkWasSuccessful( bool shouldBeSuccessful );