From c2ac2ac3bcfb30cb8ae4e95e531f1b630b8dd80e Mon Sep 17 00:00:00 2001
From: Baptiste Lepilleur <gaiacrtn@free.fr>
Date: Wed, 3 Oct 2001 20:16:12 +0000
Subject: 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.
---
 examples/cppunittest/TestResultTest.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'examples/cppunittest/TestResultTest.cpp')

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 );
 }
 
 
@@ -214,14 +218,6 @@ TestResultTest::testSynchronizationTestFailures()
 }
 
 
-void 
-TestResultTest::testSynchronizationErrors()
-{
-  m_synchronizedResult->errors();
-  checkSynchronization();
-}
-
-
 void 
 TestResultTest::testSynchronizationFailures()
 {
@@ -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() );
 }
 
 
-- 
cgit v1.2.1