3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some listener and factory clean-ups

This commit is contained in:
Phil Nash 2017-04-25 20:35:38 +01:00
parent dd78824697
commit a96f25c716
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/catch_session.hpp
View File

@ -42,7 +42,7 @@ namespace Catch {
return reporter; return reporter;
} }
Ptr<IStreamingReporter> addListeners( IConfigPtr const& config, Ptr<IStreamingReporter> reporters ) { Ptr<IStreamingReporter> addListeners( IConfigPtr const& config, Ptr<IStreamingReporter> reporters ) {
IReporterRegistry::Listeners listeners = getRegistryHub().getReporterRegistry().getListeners(); auto const& listeners = getRegistryHub().getReporterRegistry().getListeners();
for( auto const& listener : listeners ) for( auto const& listener : listeners )
reporters = addReporter(reporters, listener->create( ReporterConfig( config ) ) ); reporters = addReporter(reporters, listener->create( ReporterConfig( config ) ) );
return reporters; return reporters;

5
include/internal/catch_list.hpp
View File

@ -123,12 +123,11 @@ namespace Catch {
inline std::size_t listReporters( Config const& /*config*/ ) { inline std::size_t listReporters( Config const& /*config*/ ) {
Catch::cout() << "Available reporters:\n"; Catch::cout() << "Available reporters:\n";
IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories(); IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
IReporterRegistry::FactoryMap::const_iterator itBegin = factories.begin(), itEnd = factories.end(), it;
std::size_t maxNameLen = 0; std::size_t maxNameLen = 0;
for( auto const factoryKvp : getRegistryHub().getReporterRegistry().getFactories() ) for( auto const& factoryKvp : getRegistryHub().getReporterRegistry().getFactories() )
maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() ); maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
for( auto const factoryKvp : getRegistryHub().getReporterRegistry().getFactories() ) { for( auto const& factoryKvp : getRegistryHub().getReporterRegistry().getFactories() ) {
Text wrapper( factoryKvp.second->getDescription(), TextAttributes() Text wrapper( factoryKvp.second->getDescription(), TextAttributes()
.setInitialIndent( 0 ) .setInitialIndent( 0 )
.setIndent( 7+maxNameLen ) .setIndent( 7+maxNameLen )

2
include/internal/catch_reporter_registry.hpp
View File

@ -28,7 +28,7 @@ namespace Catch {
} }
void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) { void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
m_factories.insert( std::make_pair( name, factory ) ); m_factories.insert( { name, factory } );
} }
void registerListener( IReporterFactoryPtr const& factory ) { void registerListener( IReporterFactoryPtr const& factory ) {
m_listeners.push_back( factory ); m_listeners.push_back( factory );