mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-04 05:09:53 +01:00
converted IStreamingReporter to unique_ptr
This commit is contained in:
parent
ef8b72c949
commit
687437fcd1
@ -23,30 +23,28 @@
|
||||
namespace Catch {
|
||||
|
||||
IStreamingReporterPtr createReporter( std::string const& reporterName, IConfigPtr const& config ) {
|
||||
IStreamingReporterPtr reporter = getRegistryHub().getReporterRegistry().create( reporterName, config );
|
||||
if( !reporter ) {
|
||||
std::ostringstream oss;
|
||||
oss << "No reporter registered with name: '" << reporterName << "'";
|
||||
throw std::domain_error( oss.str() );
|
||||
}
|
||||
return reporter;
|
||||
if( auto reporter = getRegistryHub().getReporterRegistry().create( reporterName, config ) )
|
||||
return reporter;
|
||||
|
||||
std::ostringstream oss;
|
||||
oss << "No reporter registered with name: '" << reporterName << "'";
|
||||
throw std::domain_error( oss.str() );
|
||||
}
|
||||
|
||||
IStreamingReporterPtr makeReporter( std::shared_ptr<Config> const& config ) {
|
||||
std::vector<std::string> reporters = config->getReporterNames();
|
||||
if( reporters.empty() )
|
||||
reporters.push_back( "console" );
|
||||
auto const& reporterNames = config->getReporterNames();
|
||||
if( reporterNames.empty() )
|
||||
return createReporter( "console", config );
|
||||
|
||||
IStreamingReporterPtr reporter;
|
||||
for( auto const& name : reporters )
|
||||
reporter = addReporter( reporter, createReporter( name, config ) );
|
||||
for( auto const& name : reporterNames )
|
||||
addReporter( reporter, createReporter( name, config ) );
|
||||
return reporter;
|
||||
}
|
||||
IStreamingReporterPtr addListeners( IConfigPtr const& config, IStreamingReporterPtr reporters ) {
|
||||
void addListeners( IStreamingReporterPtr& reporters, IConfigPtr const& config ) {
|
||||
auto const& listeners = getRegistryHub().getReporterRegistry().getListeners();
|
||||
for( auto const& listener : listeners )
|
||||
reporters = addReporter(reporters, listener->create( ReporterConfig( config ) ) );
|
||||
return reporters;
|
||||
addReporter(reporters, listener->create( ReporterConfig( config ) ) );
|
||||
}
|
||||
|
||||
|
||||
@ -55,9 +53,9 @@ namespace Catch {
|
||||
IConfigPtr iconfig = config;
|
||||
|
||||
IStreamingReporterPtr reporter = makeReporter( config );
|
||||
reporter = addListeners( iconfig, reporter );
|
||||
addListeners( reporter, iconfig );
|
||||
|
||||
RunContext context( iconfig, reporter );
|
||||
RunContext context( iconfig, std::move( reporter ) );
|
||||
|
||||
Totals totals;
|
||||
|
||||
@ -72,7 +70,7 @@ namespace Catch {
|
||||
if( !context.aborting() && matchTest( testCase, testSpec, *iconfig ) )
|
||||
totals += context.runTest( testCase );
|
||||
else
|
||||
reporter->skipTest( testCase );
|
||||
context.reporter().skipTest( testCase );
|
||||
}
|
||||
|
||||
context.testGroupEnded( iconfig->name(), totals, 1, 1 );
|
||||
|
@ -232,9 +232,9 @@ namespace Catch
|
||||
|
||||
virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
|
||||
|
||||
virtual MultipleReporters* tryAsMulti() { return nullptr; }
|
||||
virtual bool isMulti() const { return false; }
|
||||
};
|
||||
using IStreamingReporterPtr = std::shared_ptr<IStreamingReporter>;
|
||||
using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
|
||||
|
||||
struct IReporterFactory {
|
||||
virtual ~IReporterFactory();
|
||||
@ -253,8 +253,7 @@ namespace Catch
|
||||
virtual Listeners const& getListeners() const = 0;
|
||||
};
|
||||
|
||||
IStreamingReporterPtr addReporter( IStreamingReporterPtr const& existingReporter, IStreamingReporterPtr const& additionalReporter );
|
||||
|
||||
void addReporter( IStreamingReporterPtr& existingReporter, IStreamingReporterPtr&& additionalReporter );
|
||||
}
|
||||
|
||||
#endif // TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
|
||||
|
@ -18,7 +18,7 @@ namespace Catch {
|
||||
class ReporterFactory : public IReporterFactory {
|
||||
|
||||
virtual IStreamingReporterPtr create( ReporterConfig const& config ) const {
|
||||
return std::make_shared<T>( config );
|
||||
return std::unique_ptr<T>( new T( config ) );
|
||||
}
|
||||
|
||||
virtual std::string getDescription() const {
|
||||
|
@ -59,11 +59,11 @@ namespace Catch {
|
||||
|
||||
public:
|
||||
|
||||
explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr const& reporter )
|
||||
explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter )
|
||||
: m_runInfo( _config->name() ),
|
||||
m_context( getCurrentMutableContext() ),
|
||||
m_config( _config ),
|
||||
m_reporter( reporter )
|
||||
m_reporter( std::move( reporter ) )
|
||||
{
|
||||
m_context.setRunner( this );
|
||||
m_context.setConfig( m_config );
|
||||
@ -131,6 +131,9 @@ namespace Catch {
|
||||
IConfigPtr config() const {
|
||||
return m_config;
|
||||
}
|
||||
IStreamingReporter& reporter() const {
|
||||
return *m_reporter;
|
||||
}
|
||||
|
||||
private: // IResultCapture
|
||||
|
||||
|
@ -13,12 +13,12 @@
|
||||
namespace Catch {
|
||||
|
||||
class MultipleReporters : public IStreamingReporter {
|
||||
typedef std::vector<IStreamingReporterPtr > Reporters;
|
||||
typedef std::vector<IStreamingReporterPtr> Reporters;
|
||||
Reporters m_reporters;
|
||||
|
||||
public:
|
||||
void add( IStreamingReporterPtr const& reporter ) {
|
||||
m_reporters.push_back( reporter );
|
||||
void add( IStreamingReporterPtr&& reporter ) {
|
||||
m_reporters.push_back( std::move( reporter ) );
|
||||
}
|
||||
|
||||
public: // IStreamingReporter
|
||||
@ -95,31 +95,31 @@ public: // IStreamingReporter
|
||||
reporter->skipTest( testInfo );
|
||||
}
|
||||
|
||||
virtual MultipleReporters* tryAsMulti() override {
|
||||
return this;
|
||||
virtual bool isMulti() const override {
|
||||
return true;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
IStreamingReporterPtr addReporter( IStreamingReporterPtr const& existingReporter, IStreamingReporterPtr const& additionalReporter ) {
|
||||
IStreamingReporterPtr resultingReporter;
|
||||
void addReporter( IStreamingReporterPtr& existingReporter, IStreamingReporterPtr&& additionalReporter ) {
|
||||
|
||||
if( existingReporter ) {
|
||||
MultipleReporters* multi = existingReporter->tryAsMulti();
|
||||
if( !multi ) {
|
||||
multi = new MultipleReporters;
|
||||
resultingReporter = IStreamingReporterPtr( multi );
|
||||
if( existingReporter )
|
||||
multi->add( existingReporter );
|
||||
}
|
||||
else
|
||||
resultingReporter = existingReporter;
|
||||
multi->add( additionalReporter );
|
||||
if( !existingReporter ) {
|
||||
existingReporter = std::move( additionalReporter );
|
||||
return;
|
||||
}
|
||||
else
|
||||
resultingReporter = additionalReporter;
|
||||
|
||||
return resultingReporter;
|
||||
MultipleReporters* multi = nullptr;
|
||||
|
||||
if( existingReporter->isMulti() ) {
|
||||
multi = static_cast<MultipleReporters*>( existingReporter.get() );
|
||||
}
|
||||
else {
|
||||
auto newMulti = std::unique_ptr<MultipleReporters>( new MultipleReporters );
|
||||
newMulti->add( std::move( existingReporter ) );
|
||||
multi = newMulti.get();
|
||||
existingReporter = std::move( newMulti );
|
||||
}
|
||||
multi->add( std::move( additionalReporter ) );
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user