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

Merge pull request #1336 from ax3l/topic-overrideVirtualRedundant

Browse Source 
Refactor: override implies virtual
This commit is contained in:
Martin Hořeňovský 2019-04-18 14:10:24 +02:00 committed by GitHub
commit c3c82f539c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/event-listeners.md
View File

@ -29,13 +29,13 @@ struct MyListener : Catch::TestEventListenerBase {
using TestEventListenerBase::TestEventListenerBase; // inherit constructor 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 // 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 // Tear-down after a test case is run
} }
}; };
CATCH_REGISTER_LISTENER( MyListener ) CATCH_REGISTER_LISTENER( MyListener )
``` ```

2
docs/matchers.md
View File

@ -92,7 +92,7 @@ public:
IntRange( int begin, int end ) : m_begin( begin ), m_end( end ) {} IntRange( int begin, int end ) : m_begin( begin ), m_end( end ) {}
// Performs the test for this matcher // 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; return i >= m_begin && i <= m_end;
} }

18
examples/210-Evt-EventListeners.cpp
View File

@ -305,7 +305,7 @@ struct MyListener : Catch::TestEventListenerBase {
~MyListener(); ~MyListener();
// The whole test run starting // The whole test run starting
virtual void testRunStarting( Catch::TestRunInfo const& testRunInfo ) override { void testRunStarting( Catch::TestRunInfo const& testRunInfo ) override {
std::cout std::cout
<< std::boolalpha << std::boolalpha
<< "\nEvent: testRunStarting:\n"; << "\nEvent: testRunStarting:\n";
@ -313,7 +313,7 @@ struct MyListener : Catch::TestEventListenerBase {
} }
// The whole test run ending // The whole test run ending
virtual void testRunEnded( Catch::TestRunStats const& testRunStats ) override { void testRunEnded( Catch::TestRunStats const& testRunStats ) override {
std::cout std::cout
<< dashed_line << dashed_line
<< "\nEvent: testRunEnded:\n"; << "\nEvent: testRunEnded:\n";
@ -321,7 +321,7 @@ struct MyListener : Catch::TestEventListenerBase {
} }
// A test is being skipped (because it is "hidden") // 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 std::cout
<< dashed_line << dashed_line
<< "\nEvent: skipTest:\n"; << "\nEvent: skipTest:\n";
@ -329,7 +329,7 @@ struct MyListener : Catch::TestEventListenerBase {
} }
// Test cases starting // Test cases starting
virtual void testCaseStarting( Catch::TestCaseInfo const& testInfo ) override { void testCaseStarting( Catch::TestCaseInfo const& testInfo ) override {
std::cout std::cout
<< dashed_line << dashed_line
<< "\nEvent: testCaseStarting:\n"; << "\nEvent: testCaseStarting:\n";
@ -337,30 +337,30 @@ struct MyListener : Catch::TestEventListenerBase {
} }
// Test cases ending // Test cases ending
virtual void testCaseEnded( Catch::TestCaseStats const& testCaseStats ) override { void testCaseEnded( Catch::TestCaseStats const& testCaseStats ) override {
std::cout << "\nEvent: testCaseEnded:\n"; std::cout << "\nEvent: testCaseEnded:\n";
print( std::cout, 1, "testCaseStats", testCaseStats ); print( std::cout, 1, "testCaseStats", testCaseStats );
} }
// Sections starting // Sections starting
virtual void sectionStarting( Catch::SectionInfo const& sectionInfo ) override { void sectionStarting( Catch::SectionInfo const& sectionInfo ) override {
std::cout << "\nEvent: sectionStarting:\n"; std::cout << "\nEvent: sectionStarting:\n";
print( std::cout, 1, "- sectionInfo", sectionInfo ); print( std::cout, 1, "- sectionInfo", sectionInfo );
} }
// Sections ending // Sections ending
virtual void sectionEnded( Catch::SectionStats const& sectionStats ) override { void sectionEnded( Catch::SectionStats const& sectionStats ) override {
std::cout << "\nEvent: sectionEnded:\n"; std::cout << "\nEvent: sectionEnded:\n";
print( std::cout, 1, "- sectionStats", sectionStats ); print( std::cout, 1, "- sectionStats", sectionStats );
} }
// Assertions before/ after // Assertions before/ after
virtual void assertionStarting( Catch::AssertionInfo const& assertionInfo ) override { void assertionStarting( Catch::AssertionInfo const& assertionInfo ) override {
std::cout << "\nEvent: assertionStarting:\n"; std::cout << "\nEvent: assertionStarting:\n";
print( std::cout, 1, "- assertionInfo", assertionInfo ); 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"; std::cout << "\nEvent: assertionEnded:\n";
print( std::cout, 1, "- assertionStats", assertionStats ); print( std::cout, 1, "- assertionStats", assertionStats );
return true; return true;

2
include/internal/catch_config.hpp
View File

@ -85,7 +85,7 @@ namespace Catch {
std::vector<std::string> const& getTestsOrTags() const override; std::vector<std::string> const& getTestsOrTags() const override;
std::vector<std::string> const& getSectionsToRun() const override; std::vector<std::string> const& getSectionsToRun() const override;
virtual TestSpec const& testSpec() const override; TestSpec const& testSpec() const override;
bool hasTestFilters() const override; bool hasTestFilters() const override;
bool showHelp() const; bool showHelp() const;

4
include/internal/catch_console_colour.cpp
View File

@ -69,7 +69,7 @@ namespace {
originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY ); 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 ) { switch( _colourCode ) {
case Colour::None: return setTextAttribute( originalForegroundAttributes ); case Colour::None: return setTextAttribute( originalForegroundAttributes );
case Colour::White: return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE ); case Colour::White: return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
@ -132,7 +132,7 @@ namespace {
// https://github.com/philsquared/Catch/pull/131 // https://github.com/philsquared/Catch/pull/131
class PosixColourImpl : public IColourImpl { class PosixColourImpl : public IColourImpl {
public: public:
virtual void use( Colour::Code _colourCode ) override { void use( Colour::Code _colourCode ) override {
switch( _colourCode ) { switch( _colourCode ) {
case Colour::None: case Colour::None:
case Colour::White: return setColour( "[0m" ); case Colour::White: return setColour( "[0m" );

14
include/internal/catch_context.cpp
View File

@ -13,27 +13,27 @@ namespace Catch {
class Context : public IMutableContext, NonCopyable { class Context : public IMutableContext, NonCopyable {
public: // IContext public: // IContext
virtual IResultCapture* getResultCapture() override { IResultCapture* getResultCapture() override {
return m_resultCapture; return m_resultCapture;
} }
virtual IRunner* getRunner() override { IRunner* getRunner() override {
return m_runner; return m_runner;
} }
virtual IConfigPtr const& getConfig() const override { IConfigPtr const& getConfig() const override {
return m_config; return m_config;
} }
virtual ~Context() override; ~Context() override;
public: // IMutableContext public: // IMutableContext
virtual void setResultCapture( IResultCapture* resultCapture ) override { void setResultCapture( IResultCapture* resultCapture ) override {
m_resultCapture = resultCapture; m_resultCapture = resultCapture;
} }
virtual void setRunner( IRunner* runner ) override { void setRunner( IRunner* runner ) override {
m_runner = runner; m_runner = runner;
} }
virtual void setConfig( IConfigPtr const& config ) override { void setConfig( IConfigPtr const& config ) override {
m_config = config; m_config = config;
} }

2
include/internal/catch_exception_translator_registry.h
View File

@ -19,7 +19,7 @@ namespace Catch {
public: public:
~ExceptionTranslatorRegistry(); ~ExceptionTranslatorRegistry();
virtual void registerTranslator( const IExceptionTranslator* translator ); virtual void registerTranslator( const IExceptionTranslator* translator );
virtual std::string translateActiveException() const override; std::string translateActiveException() const override;
std::string tryTranslators() const; std::string tryTranslators() const;
private: private:

8
include/internal/catch_reporter_registrars.hpp
View File

@ -18,11 +18,11 @@ namespace Catch {
class ReporterFactory : public IReporterFactory { class ReporterFactory : public IReporterFactory {
virtual IStreamingReporterPtr create( ReporterConfig const& config ) const override { IStreamingReporterPtr create( ReporterConfig const& config ) const override {
return std::unique_ptr<T>( new T( config ) ); return std::unique_ptr<T>( new T( config ) );
} }
virtual std::string getDescription() const override { std::string getDescription() const override {
return T::getDescription(); return T::getDescription();
} }
}; };
@ -39,10 +39,10 @@ namespace Catch {
class ListenerFactory : public IReporterFactory { class ListenerFactory : public IReporterFactory {
virtual IStreamingReporterPtr create( ReporterConfig const& config ) const override { IStreamingReporterPtr create( ReporterConfig const& config ) const override {
return std::unique_ptr<T>( new T( config ) ); return std::unique_ptr<T>( new T( config ) );
} }
virtual std::string getDescription() const override { std::string getDescription() const override {
return std::string(); return std::string();
} }
}; };

6
include/internal/catch_test_spec.h
View File

@ -33,7 +33,7 @@ namespace Catch {
public: public:
NamePattern( std::string const& name ); NamePattern( std::string const& name );
virtual ~NamePattern(); virtual ~NamePattern();
virtual bool matches( TestCaseInfo const& testCase ) const override; bool matches( TestCaseInfo const& testCase ) const override;
private: private:
WildcardPattern m_wildcardPattern; WildcardPattern m_wildcardPattern;
}; };
@ -42,7 +42,7 @@ namespace Catch {
public: public:
TagPattern( std::string const& tag ); TagPattern( std::string const& tag );
virtual ~TagPattern(); virtual ~TagPattern();
virtual bool matches( TestCaseInfo const& testCase ) const override; bool matches( TestCaseInfo const& testCase ) const override;
private: private:
std::string m_tag; std::string m_tag;
}; };
@ -51,7 +51,7 @@ namespace Catch {
public: public:
ExcludedPattern( PatternPtr const& underlyingPattern ); ExcludedPattern( PatternPtr const& underlyingPattern );
virtual ~ExcludedPattern(); virtual ~ExcludedPattern();
virtual bool matches( TestCaseInfo const& testCase ) const override; bool matches( TestCaseInfo const& testCase ) const override;
private: private:
PatternPtr m_underlyingPattern; PatternPtr m_underlyingPattern;
}; };