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

Keep stack of runners and pass success/ fail count to EndTestCase

Browse Source
This commit is contained in:
Phil Nash 2011-01-14 08:26:58 +00:00
parent b81e0b9e9c
commit 4b162c1341
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
catch_reporter_basic.hpp
View File

@ -155,7 +155,7 @@ namespace Catch
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
virtual void EndTestCase( const TestCaseInfo& testInfo, const std::string& stdOut, const std::string& stdErr ) virtual void EndTestCase( const TestCaseInfo& testInfo, std::size_t succeeded, std::size_t failed, const std::string& stdOut, const std::string& stdErr )
{ {
if( !stdOut.empty() ) if( !stdOut.empty() )
m_config.stream() << "[stdout: " << trim( stdOut ) << "]\n"; m_config.stream() << "[stdout: " << trim( stdOut ) << "]\n";
@ -163,7 +163,9 @@ namespace Catch
if( !stdErr.empty() ) if( !stdErr.empty() )
m_config.stream() << "[stderr: " << trim( stdErr ) << "]\n"; m_config.stream() << "[stderr: " << trim( stdErr ) << "]\n";
m_config.stream() << "[Finished: " << testInfo.getName() << "]" << std::endl; m_config.stream() << "[Finished: " << testInfo.getName() << " ";
ReportCounts( succeeded, failed );
m_config.stream() << "]" << std::endl;
} }
private: private:

2
catch_reporter_junit.hpp
View File

@ -166,7 +166,7 @@ namespace Catch
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
virtual void EndTestCase( const Catch::TestCaseInfo&, const std::string& stdOut, const std::string& stdErr ) virtual void EndTestCase( const Catch::TestCaseInfo&, std::size_t /* succeeded */, std::size_t /* failed */, const std::string& stdOut, const std::string& stdErr )
{ {
if( !stdOut.empty() ) if( !stdOut.empty() )
m_stdOut << stdOut << "\n"; m_stdOut << stdOut << "\n";

2
catch_reporter_xml.hpp
View File

@ -139,7 +139,7 @@ namespace Catch
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
virtual void EndTestCase( const Catch::TestCaseInfo&, const std::string& /*stdOut*/, const std::string& /*stdErr*/ ) virtual void EndTestCase( const Catch::TestCaseInfo&, std::size_t /* succeeded */, std::size_t /* failed */, const std::string& /*stdOut*/, const std::string& /*stdErr*/ )
{ {
m_xml.scopedElement( "OverallResult" ).writeAttribute( "success", m_currentTestSuccess ); m_xml.scopedElement( "OverallResult" ).writeAttribute( "success", m_currentTestSuccess );
m_xml.endElement(); m_xml.endElement();

2
internal/catch_interfaces_reporter.h
View File

@ -75,6 +75,8 @@ namespace Catch
virtual void EndTestCase virtual void EndTestCase
( const TestCaseInfo& testInfo, ( const TestCaseInfo& testInfo,
std::size_t succeeded,
std::size_t failed,
const std::string& stdOut, const std::string& stdOut,
const std::string& stdErr const std::string& stdErr
) = 0; ) = 0;

16
internal/catch_runner_impl.hpp
View File

@ -16,6 +16,7 @@
#include "catch_interfaces_reporter.h" #include "catch_interfaces_reporter.h"
#include "catch_config.hpp" #include "catch_config.hpp"
#include "catch_test_registry.hpp" #include "catch_test_registry.hpp"
#include "catch_test_case_info.hpp"
#include "catch_capture.hpp" #include "catch_capture.hpp"
namespace Catch namespace Catch
@ -87,7 +88,9 @@ namespace Catch
: m_config( config ), : m_config( config ),
m_successes( 0 ), m_successes( 0 ),
m_failures( 0 ), m_failures( 0 ),
m_reporter( m_config.getReporter() ) m_reporter( m_config.getReporter() ),
m_prevRunner( &Hub::getRunner() ),
m_prevResultCapture( &Hub::getResultCapture() )
{ {
Hub::setRunner( this ); Hub::setRunner( this );
Hub::setResultCapture( this ); Hub::setResultCapture( this );
@ -99,8 +102,8 @@ namespace Catch
() ()
{ {
m_reporter->EndTesting( m_successes, m_failures ); m_reporter->EndTesting( m_successes, m_failures );
Hub::setRunner( NULL ); Hub::setRunner( m_prevRunner );
Hub::setResultCapture( NULL ); Hub::setResultCapture( m_prevResultCapture );
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -141,6 +144,9 @@ namespace Catch
const TestCaseInfo& testInfo const TestCaseInfo& testInfo
) )
{ {
std::size_t prevSuccessCount = m_successes;
std::size_t prevFailureCount = m_failures;
m_reporter->StartTestCase( testInfo ); m_reporter->StartTestCase( testInfo );
std::string redirectedCout; std::string redirectedCout;
@ -167,7 +173,7 @@ namespace Catch
acceptResult( ResultWas::ThrewException ); acceptResult( ResultWas::ThrewException );
} }
m_info.clear(); m_info.clear();
m_reporter->EndTestCase( testInfo, redirectedCout, redirectedCerr ); m_reporter->EndTestCase( testInfo, m_successes - prevSuccessCount, m_failures - prevFailureCount, redirectedCout, redirectedCerr );
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -326,6 +332,8 @@ namespace Catch
IReporter* m_reporter; IReporter* m_reporter;
std::vector<ScopedInfo*> m_scopedInfos; std::vector<ScopedInfo*> m_scopedInfos;
std::vector<ResultInfo> m_info; std::vector<ResultInfo> m_info;
IRunner* m_prevRunner;
IResultCapture* m_prevResultCapture;
}; };
} }