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

Use unique_ptr for passing around exception translators

Browse Source
This commit is contained in:
Martin Hořeňovský 2021-06-19 20:57:06 +02:00
parent 28a33497be
commit a7533707ff
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/catch2/catch_registry_hub.cpp
View File

@ -56,8 +56,8 @@ namespace Catch {
void registerTest( Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker ) override { void registerTest( Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker ) override {
m_testCaseRegistry.registerTest( std::move(testInfo), std::move(invoker) ); m_testCaseRegistry.registerTest( std::move(testInfo), std::move(invoker) );
} }
void registerTranslator( const IExceptionTranslator* translator ) override { void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) override {
m_exceptionTranslatorRegistry.registerTranslator( translator ); m_exceptionTranslatorRegistry.registerTranslator( std::move(translator) );
} }
void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override { void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
m_tagAliasRegistry.add( alias, tag, lineInfo ); m_tagAliasRegistry.add( alias, tag, lineInfo );

7
src/catch2/catch_translate_exception.hpp
View File

@ -48,8 +48,11 @@ namespace Catch {
public: public:
template<typename T> template<typename T>
ExceptionTranslatorRegistrar( std::string(*translateFunction)( T const& ) ) { ExceptionTranslatorRegistrar( std::string(*translateFunction)( T const& ) ) {
getMutableRegistryHub().registerTranslator getMutableRegistryHub().registerTranslator(
( new ExceptionTranslator<T>( translateFunction ) ); Detail::unique_ptr<IExceptionTranslator>(
new ExceptionTranslator<T>( translateFunction )
)
);
} }
}; };

2
src/catch2/interfaces/catch_interfaces_registry_hub.hpp
View File

@ -47,7 +47,7 @@ namespace Catch {
virtual void registerReporter( std::string const& name, IReporterFactoryPtr factory ) = 0; virtual void registerReporter( std::string const& name, IReporterFactoryPtr factory ) = 0;
virtual void registerListener( IReporterFactoryPtr factory ) = 0; virtual void registerListener( IReporterFactoryPtr factory ) = 0;
virtual void registerTest(Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker) = 0; virtual void registerTest(Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker) = 0;
virtual void registerTranslator( const IExceptionTranslator* translator ) = 0; virtual void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) = 0;
virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0; virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
virtual void registerStartupException() noexcept = 0; virtual void registerStartupException() noexcept = 0;
virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0; virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;

4
src/catch2/internal/catch_exception_translator_registry.cpp
View File

@ -15,8 +15,8 @@ namespace Catch {
ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() { ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
} }
void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) { void ExceptionTranslatorRegistry::registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) {
m_translators.push_back( Detail::unique_ptr<const IExceptionTranslator>( translator ) ); m_translators.push_back( std::move( translator ) );
} }
#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) #if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)

4
src/catch2/internal/catch_exception_translator_registry.hpp
View File

@ -9,6 +9,8 @@
#define CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED #define CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
#include <catch2/interfaces/catch_interfaces_exception.hpp> #include <catch2/interfaces/catch_interfaces_exception.hpp>
#include <catch2/internal/catch_unique_ptr.hpp>
#include <vector> #include <vector>
#include <string> #include <string>
@ -17,7 +19,7 @@ namespace Catch {
class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry { class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
public: public:
~ExceptionTranslatorRegistry() override; ~ExceptionTranslatorRegistry() override;
void registerTranslator( const IExceptionTranslator* translator ); void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator );
std::string translateActiveException() const override; std::string translateActiveException() const override;
std::string tryTranslators() const; std::string tryTranslators() const;