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

Optional support for listener descriptions

Browse Source
This commit is contained in:
Martin Hořeňovský 2022-05-10 13:52:16 +02:00
parent d60fbe49be
commit ae475a3c19
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/catch2/reporters/catch_reporter_registrars.hpp
View File

@ -14,9 +14,23 @@
#include <catch2/internal/catch_compiler_capabilities.hpp> #include <catch2/internal/catch_compiler_capabilities.hpp>
#include <catch2/internal/catch_unique_ptr.hpp> #include <catch2/internal/catch_unique_ptr.hpp>
#include <catch2/internal/catch_move_and_forward.hpp> #include <catch2/internal/catch_move_and_forward.hpp>
#include <catch2/internal/catch_void_type.hpp>
#include <type_traits>
namespace Catch { namespace Catch {
namespace Detail {
template <typename T, typename = void>
struct has_description : std::false_type {};
template <typename T>
struct has_description<
T,
void_t<decltype( T::getDescription() )>>
: std::true_type {};
}
class IEventListener; class IEventListener;
using IEventListenerPtr = Detail::unique_ptr<IEventListener>; using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
@ -45,20 +59,33 @@ namespace Catch {
class ListenerRegistrar { class ListenerRegistrar {
class TypedListenerFactory : public EventListenerFactory { class TypedListenerFactory : public EventListenerFactory {
StringRef m_defaultDescription;
IEventListenerPtr std::string getDescriptionImpl( std::true_type ) const {
create( IConfig const* config ) const override { return T::getDescription();
return Detail::make_unique<T>(config);
} }
std::string getDescriptionImpl( std::false_type ) const {
return static_cast<std::string>(m_defaultDescription);
}
public:
TypedListenerFactory( StringRef defaultDescription ):
m_defaultDescription( defaultDescription ) {}
IEventListenerPtr create( IConfig const* config ) const override {
return Detail::make_unique<T>( config );
}
std::string getDescription() const override { std::string getDescription() const override {
return std::string(); return getDescriptionImpl( Detail::has_description<T>{} );
} }
}; };
public: public:
ListenerRegistrar() { ListenerRegistrar(StringRef defaultDescription) {
getMutableRegistryHub().registerListener( Detail::make_unique<TypedListenerFactory>() ); getMutableRegistryHub().registerListener( Detail::make_unique<TypedListenerFactory>(defaultDescription) );
} }
}; };
} }
@ -74,7 +101,7 @@ namespace Catch {
#define CATCH_REGISTER_LISTENER( listenerType ) \ #define CATCH_REGISTER_LISTENER( listenerType ) \
CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \ CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \ namespace { Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType(#listenerType); } \
CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
#else // CATCH_CONFIG_DISABLE #else // CATCH_CONFIG_DISABLE