3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-29 16:53:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only report test case once for all sections within it

Browse Source
This commit is contained in:
Phil Nash 2011-01-19 19:30:01 +00:00
parent 6a6b346731
commit 455c2998a0
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
internal/catch_runner_impl.hpp
View File

@ -187,16 +187,26 @@ namespace Catch
const TestCaseInfo& testInfo const TestCaseInfo& testInfo
) )
{ {
std::size_t prevSuccessCount = m_successes;
std::size_t prevFailureCount = m_failures;
std::string redirectedCout;
std::string redirectedCerr;
m_reporter->StartTestCase( testInfo );
m_runningTest = RunningTest( &testInfo ); m_runningTest = RunningTest( &testInfo );
do do
{ {
m_runningTest.resetSectionSeen(); m_runningTest.resetSectionSeen();
runCurrentTest(); runCurrentTest( redirectedCout, redirectedCerr );
} }
while( m_runningTest.wasSectionSeen() ); while( m_runningTest.wasSectionSeen() );
m_runningTest = RunningTest(); m_runningTest = RunningTest();
m_reporter->EndTestCase( testInfo, m_successes - prevSuccessCount, m_failures - prevFailureCount, redirectedCout, redirectedCerr );
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -352,16 +362,11 @@ namespace Catch
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
void runCurrentTest void runCurrentTest
() (
std::string& redirectedCout,
std::string& redirectedCerr
)
{ {
std::size_t prevSuccessCount = m_successes;
std::size_t prevFailureCount = m_failures;
m_reporter->StartTestCase( m_runningTest.getTestCaseInfo() );
std::string redirectedCout;
std::string redirectedCerr;
try try
{ {
StreamRedirect coutRedir( std::cout, redirectedCout ); StreamRedirect coutRedir( std::cout, redirectedCout );
@ -383,7 +388,6 @@ namespace Catch
acceptResult( ResultWas::ThrewException ); acceptResult( ResultWas::ThrewException );
} }
m_info.clear(); m_info.clear();
m_reporter->EndTestCase( m_runningTest.getTestCaseInfo(), m_successes - prevSuccessCount, m_failures - prevFailureCount, redirectedCout, redirectedCerr );
} }
private: private: