eden-emu/Catch2
15
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-05-30 16:37:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactored more into Hub

Browse source
This commit is contained in:
Phil Nash 2011-01-11 09:13:31 +00:00
parent fd58d48665
commit 263c046b84
12 changed files with 207 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

20
internal/catch_runner_impl.hpp
View file

@ -12,6 +12,7 @@
#ifndef TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED
#define TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED
#include "catch_interfaces_runner.h"
#include "catch_interfaces_reporter.h"
#include "catch_config.hpp"
#include "catch_test_registry.hpp"
@ -70,7 +71,7 @@ namespace Catch
std::string& m_targetString;
};
class Runner : public IResultListener
class Runner : public IResultCapture, public IRunner
{
Runner( const Runner& );
void operator =( const Runner& );
@ -82,15 +83,19 @@ namespace Catch
m_failures( 0 ),
m_reporter( m_config.getReporter() )
{
Hub::setRunner( this );
Hub::setResultCapture( this );
m_reporter->StartTesting();
}
~Runner()
{
m_reporter->EndTesting( m_successes, m_failures );
Hub::setRunner( NULL );
Hub::setResultCapture( NULL );
}
void runAll()
virtual void runAll()
{
std::vector<TestCaseInfo> allTests = Hub::getTestCaseRegistry().getAllTests();
for( std::size_t i=0; i < allTests.size(); ++i )
@ -99,7 +104,7 @@ namespace Catch
}
}
std::size_t runMatching( const std::string& rawTestSpec )
virtual std::size_t runMatching( const std::string& rawTestSpec )
{
TestSpec testSpec( rawTestSpec );
@ -118,7 +123,6 @@ namespace Catch
void runTest( const TestCaseInfo& testInfo )
{
IResultListener* prevListener = ResultsCapture::setListener( this );
m_reporter->StartTestCase( testInfo );
std::string redirectedCout;
@ -146,19 +150,19 @@ namespace Catch
}
m_info.clear();
m_reporter->EndTestCase( testInfo, redirectedCout, redirectedCerr );
ResultsCapture::setListener( prevListener );
}
std::size_t getSuccessCount() const
virtual std::size_t getSuccessCount() const
{
return m_successes;
}
std:: size_t getFailureCount() const
virtual std:: size_t getFailureCount() const
{
return m_failures;
}
private: // IResultListener
private: // IResultCapture
virtual ResultAction::Value acceptResult( bool result )
{