From 5347ff9e5f7e9160642f6f0a4c28fd0a13a7eed8 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 12 Jul 2018 14:27:06 +0200 Subject: [PATCH] Refactor: override implies virtual If not used with `final`, override implies `virtual`. Detected via CodeFactor score. Another reference on SO: https://stackoverflow.com/questions/43466863/isnt-virtual-keyword-redundant-when-override-or-final-specifiers-are-used --- docs/event-listeners.md | 6 +++--- docs/matchers.md | 2 +- examples/210-Evt-EventListeners.cpp | 18 +++++++++--------- include/internal/catch_config.hpp | 2 +- include/internal/catch_console_colour.cpp | 4 ++-- include/internal/catch_context.cpp | 14 +++++++------- .../catch_exception_translator_registry.h | 2 +- include/internal/catch_reporter_registrars.hpp | 8 ++++---- include/internal/catch_test_spec.h | 6 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/event-listeners.md b/docs/event-listeners.md index c6625a2e..62311006 100644 --- a/docs/event-listeners.md +++ b/docs/event-listeners.md @@ -29,13 +29,13 @@ struct MyListener : Catch::TestEventListenerBase { using TestEventListenerBase::TestEventListenerBase; // inherit constructor - virtual void testCaseStarting( Catch::TestCaseInfo const& testInfo ) override { + void testCaseStarting( Catch::TestCaseInfo const& testInfo ) override { // Perform some setup before a test case is run } - virtual void testCaseEnded( Catch::TestCaseStats const& testCaseStats ) override { + void testCaseEnded( Catch::TestCaseStats const& testCaseStats ) override { // Tear-down after a test case is run - } + } }; CATCH_REGISTER_LISTENER( MyListener ) ``` diff --git a/docs/matchers.md b/docs/matchers.md index adbd4ce7..0ce9871b 100644 --- a/docs/matchers.md +++ b/docs/matchers.md @@ -92,7 +92,7 @@ public: IntRange( int begin, int end ) : m_begin( begin ), m_end( end ) {} // Performs the test for this matcher - virtual bool match( int const& i ) const override { + bool match( int const& i ) const override { return i >= m_begin && i <= m_end; } diff --git a/examples/210-Evt-EventListeners.cpp b/examples/210-Evt-EventListeners.cpp index 7df93d71..63a82200 100644 --- a/examples/210-Evt-EventListeners.cpp +++ b/examples/210-Evt-EventListeners.cpp @@ -305,7 +305,7 @@ struct MyListener : Catch::TestEventListenerBase { ~MyListener(); // The whole test run starting - virtual void testRunStarting( Catch::TestRunInfo const& testRunInfo ) override { + void testRunStarting( Catch::TestRunInfo const& testRunInfo ) override { std::cout << std::boolalpha << "\nEvent: testRunStarting:\n"; @@ -313,7 +313,7 @@ struct MyListener : Catch::TestEventListenerBase { } // The whole test run ending - virtual void testRunEnded( Catch::TestRunStats const& testRunStats ) override { + void testRunEnded( Catch::TestRunStats const& testRunStats ) override { std::cout << dashed_line << "\nEvent: testRunEnded:\n"; @@ -321,7 +321,7 @@ struct MyListener : Catch::TestEventListenerBase { } // A test is being skipped (because it is "hidden") - virtual void skipTest( Catch::TestCaseInfo const& testInfo ) override { + void skipTest( Catch::TestCaseInfo const& testInfo ) override { std::cout << dashed_line << "\nEvent: skipTest:\n"; @@ -329,7 +329,7 @@ struct MyListener : Catch::TestEventListenerBase { } // Test cases starting - virtual void testCaseStarting( Catch::TestCaseInfo const& testInfo ) override { + void testCaseStarting( Catch::TestCaseInfo const& testInfo ) override { std::cout << dashed_line << "\nEvent: testCaseStarting:\n"; @@ -337,30 +337,30 @@ struct MyListener : Catch::TestEventListenerBase { } // Test cases ending - virtual void testCaseEnded( Catch::TestCaseStats const& testCaseStats ) override { + void testCaseEnded( Catch::TestCaseStats const& testCaseStats ) override { std::cout << "\nEvent: testCaseEnded:\n"; print( std::cout, 1, "testCaseStats", testCaseStats ); } // Sections starting - virtual void sectionStarting( Catch::SectionInfo const& sectionInfo ) override { + void sectionStarting( Catch::SectionInfo const& sectionInfo ) override { std::cout << "\nEvent: sectionStarting:\n"; print( std::cout, 1, "- sectionInfo", sectionInfo ); } // Sections ending - virtual void sectionEnded( Catch::SectionStats const& sectionStats ) override { + void sectionEnded( Catch::SectionStats const& sectionStats ) override { std::cout << "\nEvent: sectionEnded:\n"; print( std::cout, 1, "- sectionStats", sectionStats ); } // Assertions before/ after - virtual void assertionStarting( Catch::AssertionInfo const& assertionInfo ) override { + void assertionStarting( Catch::AssertionInfo const& assertionInfo ) override { std::cout << "\nEvent: assertionStarting:\n"; print( std::cout, 1, "- assertionInfo", assertionInfo ); } - virtual bool assertionEnded( Catch::AssertionStats const& assertionStats ) override { + bool assertionEnded( Catch::AssertionStats const& assertionStats ) override { std::cout << "\nEvent: assertionEnded:\n"; print( std::cout, 1, "- assertionStats", assertionStats ); return true; diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp index 7bafc9c3..91660d61 100644 --- a/include/internal/catch_config.hpp +++ b/include/internal/catch_config.hpp @@ -85,7 +85,7 @@ namespace Catch { std::vector const& getTestsOrTags() const; std::vector const& getSectionsToRun() const override; - virtual TestSpec const& testSpec() const override; + TestSpec const& testSpec() const override; bool hasTestFilters() const override; bool showHelp() const; diff --git a/include/internal/catch_console_colour.cpp b/include/internal/catch_console_colour.cpp index 5fb1d07f..d025adb8 100644 --- a/include/internal/catch_console_colour.cpp +++ b/include/internal/catch_console_colour.cpp @@ -69,7 +69,7 @@ namespace { originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY ); } - virtual void use( Colour::Code _colourCode ) override { + void use( Colour::Code _colourCode ) override { switch( _colourCode ) { case Colour::None: return setTextAttribute( originalForegroundAttributes ); case Colour::White: return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE ); @@ -132,7 +132,7 @@ namespace { // https://github.com/philsquared/Catch/pull/131 class PosixColourImpl : public IColourImpl { public: - virtual void use( Colour::Code _colourCode ) override { + void use( Colour::Code _colourCode ) override { switch( _colourCode ) { case Colour::None: case Colour::White: return setColour( "[0m" ); diff --git a/include/internal/catch_context.cpp b/include/internal/catch_context.cpp index e116f28f..52fca302 100644 --- a/include/internal/catch_context.cpp +++ b/include/internal/catch_context.cpp @@ -13,27 +13,27 @@ namespace Catch { class Context : public IMutableContext, NonCopyable { public: // IContext - virtual IResultCapture* getResultCapture() override { + IResultCapture* getResultCapture() override { return m_resultCapture; } - virtual IRunner* getRunner() override { + IRunner* getRunner() override { return m_runner; } - virtual IConfigPtr const& getConfig() const override { + IConfigPtr const& getConfig() const override { return m_config; } - virtual ~Context() override; + ~Context() override; public: // IMutableContext - virtual void setResultCapture( IResultCapture* resultCapture ) override { + void setResultCapture( IResultCapture* resultCapture ) override { m_resultCapture = resultCapture; } - virtual void setRunner( IRunner* runner ) override { + void setRunner( IRunner* runner ) override { m_runner = runner; } - virtual void setConfig( IConfigPtr const& config ) override { + void setConfig( IConfigPtr const& config ) override { m_config = config; } diff --git a/include/internal/catch_exception_translator_registry.h b/include/internal/catch_exception_translator_registry.h index da2f4f12..bb07c131 100644 --- a/include/internal/catch_exception_translator_registry.h +++ b/include/internal/catch_exception_translator_registry.h @@ -19,7 +19,7 @@ namespace Catch { public: ~ExceptionTranslatorRegistry(); virtual void registerTranslator( const IExceptionTranslator* translator ); - virtual std::string translateActiveException() const override; + std::string translateActiveException() const override; std::string tryTranslators() const; private: diff --git a/include/internal/catch_reporter_registrars.hpp b/include/internal/catch_reporter_registrars.hpp index 943fba65..660f554a 100644 --- a/include/internal/catch_reporter_registrars.hpp +++ b/include/internal/catch_reporter_registrars.hpp @@ -18,11 +18,11 @@ namespace Catch { class ReporterFactory : public IReporterFactory { - virtual IStreamingReporterPtr create( ReporterConfig const& config ) const override { + IStreamingReporterPtr create( ReporterConfig const& config ) const override { return std::unique_ptr( new T( config ) ); } - virtual std::string getDescription() const override { + std::string getDescription() const override { return T::getDescription(); } }; @@ -39,10 +39,10 @@ namespace Catch { class ListenerFactory : public IReporterFactory { - virtual IStreamingReporterPtr create( ReporterConfig const& config ) const override { + IStreamingReporterPtr create( ReporterConfig const& config ) const override { return std::unique_ptr( new T( config ) ); } - virtual std::string getDescription() const override { + std::string getDescription() const override { return std::string(); } }; diff --git a/include/internal/catch_test_spec.h b/include/internal/catch_test_spec.h index baf8b019..d2565187 100644 --- a/include/internal/catch_test_spec.h +++ b/include/internal/catch_test_spec.h @@ -33,7 +33,7 @@ namespace Catch { public: NamePattern( std::string const& name ); virtual ~NamePattern(); - virtual bool matches( TestCaseInfo const& testCase ) const override; + bool matches( TestCaseInfo const& testCase ) const override; private: WildcardPattern m_wildcardPattern; }; @@ -42,7 +42,7 @@ namespace Catch { public: TagPattern( std::string const& tag ); virtual ~TagPattern(); - virtual bool matches( TestCaseInfo const& testCase ) const override; + bool matches( TestCaseInfo const& testCase ) const override; private: std::string m_tag; }; @@ -51,7 +51,7 @@ namespace Catch { public: ExcludedPattern( PatternPtr const& underlyingPattern ); virtual ~ExcludedPattern(); - virtual bool matches( TestCaseInfo const& testCase ) const override; + bool matches( TestCaseInfo const& testCase ) const override; private: PatternPtr m_underlyingPattern; };