summaryrefslogtreecommitdiff
path: root/examples/cppunittest/TestResultTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/cppunittest/TestResultTest.cpp')
-rw-r--r--examples/cppunittest/TestResultTest.cpp30
1 files changed, 15 insertions, 15 deletions
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() );
}