summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Becker <fb@vxapps.com>2021-10-01 02:25:02 +0800
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2021-10-01 02:27:28 +0800
commit4a09e067ec7ba06bc89cf30075f4befc892945d9 (patch)
tree6beb601db76fc6cc947fc578366e7f8791a26630
parent89c831e25ab566756288c45e5505815e9185b276 (diff)
downloadcppunit-4a09e067ec7ba06bc89cf30075f4befc892945d9.tar.gz
add override annotations
-rw-r--r--include/cppunit/BriefTestProgressListener.h8
-rw-r--r--include/cppunit/CompilerOutputter.h4
-rw-r--r--include/cppunit/Exception.h4
-rw-r--r--include/cppunit/TestCase.h6
-rw-r--r--include/cppunit/TestComposite.h8
-rw-r--r--include/cppunit/TestLeaf.h6
-rw-r--r--include/cppunit/TestResult.h2
-rw-r--r--include/cppunit/TestResultCollector.h8
-rw-r--r--include/cppunit/TestRunner.h8
-rw-r--r--include/cppunit/TestSuccessListener.h4
-rw-r--r--include/cppunit/TestSuite.h6
-rw-r--r--include/cppunit/TextOutputter.h4
-rw-r--r--include/cppunit/TextTestProgressListener.h8
-rw-r--r--include/cppunit/TextTestResult.h4
-rw-r--r--include/cppunit/XmlOutputter.h4
-rw-r--r--include/cppunit/extensions/RepeatedTest.h4
-rw-r--r--include/cppunit/extensions/TestCaseDecorator.h10
-rw-r--r--include/cppunit/extensions/TestDecorator.h12
-rw-r--r--include/cppunit/extensions/TestFactoryRegistry.h4
-rw-r--r--include/cppunit/extensions/TestSetUp.h2
-rw-r--r--include/cppunit/plugin/DynamicLibraryManagerException.h2
-rw-r--r--include/cppunit/plugin/TestPlugInDefaultImpl.h14
-rw-r--r--include/cppunit/ui/text/TextTestRunner.h4
-rw-r--r--src/cppunit/DefaultProtector.h2
-rw-r--r--src/cppunit/ProtectorChain.cpp2
-rw-r--r--src/cppunit/ProtectorChain.h4
-rw-r--r--src/cppunit/TestCase.cpp2
27 files changed, 73 insertions, 73 deletions
diff --git a/include/cppunit/BriefTestProgressListener.h b/include/cppunit/BriefTestProgressListener.h
index 137ca44..b97be20 100644
--- a/include/cppunit/BriefTestProgressListener.h
+++ b/include/cppunit/BriefTestProgressListener.h
@@ -18,13 +18,13 @@ public:
BriefTestProgressListener();
/// Destructor.
- virtual ~BriefTestProgressListener();
+ virtual ~BriefTestProgressListener() override;
- void startTest( Test *test );
+ void startTest( Test *test ) override;
- void addFailure( const TestFailure &failure );
+ void addFailure( const TestFailure &failure ) override;
- void endTest( Test *test );
+ void endTest( Test *test ) override;
private:
/// Prevents the use of the copy constructor.
diff --git a/include/cppunit/CompilerOutputter.h b/include/cppunit/CompilerOutputter.h
index 885fe65..7c374c9 100644
--- a/include/cppunit/CompilerOutputter.h
+++ b/include/cppunit/CompilerOutputter.h
@@ -68,7 +68,7 @@ public:
const std::string &locationFormat = CPPUNIT_COMPILER_LOCATION_FORMAT );
/// Destructor.
- virtual ~CompilerOutputter();
+ virtual ~CompilerOutputter() override;
/*! \brief Sets the error location format.
*
@@ -102,7 +102,7 @@ public:
static CompilerOutputter *defaultOutputter( TestResultCollector *result,
OStream &stream );
- void write();
+ void write() override;
void setNoWrap();
diff --git a/include/cppunit/Exception.h b/include/cppunit/Exception.h
index bf5fcac..90bedd4 100644
--- a/include/cppunit/Exception.h
+++ b/include/cppunit/Exception.h
@@ -41,13 +41,13 @@ public:
Exception( const Exception &other );
/// Destructs the exception
- virtual ~Exception() throw();
+ virtual ~Exception() noexcept override;
/// Performs an assignment
Exception &operator =( const Exception &other );
/// Returns descriptive message
- const char *what() const throw();
+ const char *what() const noexcept override;
/// Location where the error occured
SourceLine sourceLine() const;
diff --git a/include/cppunit/TestCase.h b/include/cppunit/TestCase.h
index d4b7a46..e966854 100644
--- a/include/cppunit/TestCase.h
+++ b/include/cppunit/TestCase.h
@@ -33,11 +33,11 @@ public:
TestCase();
- ~TestCase();
+ ~TestCase() override;
- virtual void run(TestResult *result);
+ virtual void run(TestResult *result) override;
- std::string getName() const;
+ std::string getName() const override;
//! FIXME: this should probably be pure virtual.
virtual void runTest();
diff --git a/include/cppunit/TestComposite.h b/include/cppunit/TestComposite.h
index 0ded95f..4f3fff3 100644
--- a/include/cppunit/TestComposite.h
+++ b/include/cppunit/TestComposite.h
@@ -19,13 +19,13 @@ class CPPUNIT_API TestComposite : public Test
public:
TestComposite( const std::string &name = "" );
- ~TestComposite();
+ ~TestComposite() override;
- void run( TestResult *result );
+ void run( TestResult *result ) override;
- int countTestCases() const;
+ int countTestCases() const override;
- std::string getName() const;
+ std::string getName() const override;
private:
TestComposite( const TestComposite &other );
diff --git a/include/cppunit/TestLeaf.h b/include/cppunit/TestLeaf.h
index c83b075..d41bca7 100644
--- a/include/cppunit/TestLeaf.h
+++ b/include/cppunit/TestLeaf.h
@@ -23,7 +23,7 @@ public:
* \return 1.
* \see Test::countTestCases().
*/
- int countTestCases() const;
+ int countTestCases() const override;
/*! Returns the number of child of this test case: 0.
*
@@ -31,12 +31,12 @@ public:
*
* \return 0.
*/
- int getChildTestCount() const;
+ int getChildTestCount() const override;
/*! Always throws std::out_of_range.
* \see Test::doGetChildTestAt().
*/
- Test *doGetChildTestAt( int index ) const;
+ Test *doGetChildTestAt( int index ) const override;
};
CPPUNIT_NS_END
diff --git a/include/cppunit/TestResult.h b/include/cppunit/TestResult.h
index aabd80b..3c4ddc9 100644
--- a/include/cppunit/TestResult.h
+++ b/include/cppunit/TestResult.h
@@ -51,7 +51,7 @@ public:
TestResult( SynchronizationObject *syncObject = 0 );
/// Destroys a test result
- virtual ~TestResult();
+ virtual ~TestResult() override;
virtual void addListener( TestListener *listener );
diff --git a/include/cppunit/TestResultCollector.h b/include/cppunit/TestResultCollector.h
index b78c978..287f019 100644
--- a/include/cppunit/TestResultCollector.h
+++ b/include/cppunit/TestResultCollector.h
@@ -40,12 +40,12 @@ public:
TestResultCollector( SynchronizationObject *syncObject = 0 );
/// Destructor.
- virtual ~TestResultCollector();
+ virtual ~TestResultCollector() override;
- void startTest( Test *test );
- void addFailure( const TestFailure &failure );
+ void startTest( Test *test ) override;
+ void addFailure( const TestFailure &failure ) override;
- virtual void reset();
+ virtual void reset() override;
virtual int runTests() const;
virtual int testErrors() const;
diff --git a/include/cppunit/TestRunner.h b/include/cppunit/TestRunner.h
index 930370a..ba854e1 100644
--- a/include/cppunit/TestRunner.h
+++ b/include/cppunit/TestRunner.h
@@ -102,14 +102,14 @@ protected:
public:
WrappingSuite( const std::string &name = "All Tests" );
- int getChildTestCount() const;
+ int getChildTestCount() const override;
- std::string getName() const;
+ std::string getName() const override;
- void run( TestResult *result );
+ void run( TestResult *result ) override;
protected:
- Test *doGetChildTestAt( int index ) const;
+ Test *doGetChildTestAt( int index ) const override;
bool hasOnlyOneTest() const;
diff --git a/include/cppunit/TestSuccessListener.h b/include/cppunit/TestSuccessListener.h
index 60c5ff5..18de362 100644
--- a/include/cppunit/TestSuccessListener.h
+++ b/include/cppunit/TestSuccessListener.h
@@ -20,11 +20,11 @@ public:
TestSuccessListener( SynchronizationObject *syncObject = 0 );
/// Destructor.
- virtual ~TestSuccessListener();
+ virtual ~TestSuccessListener() override;
virtual void reset();
- void addFailure( const TestFailure &failure );
+ void addFailure( const TestFailure &failure ) override;
/// Returns whether the entire test was successful or not.
virtual bool wasSuccessful() const;
diff --git a/include/cppunit/TestSuite.h b/include/cppunit/TestSuite.h
index e02d1e2..9b613c5 100644
--- a/include/cppunit/TestSuite.h
+++ b/include/cppunit/TestSuite.h
@@ -44,7 +44,7 @@ public:
*/
TestSuite( std::string name = "" );
- ~TestSuite();
+ ~TestSuite() override;
/*! Adds the specified test to the suite.
* \param test Test to add. Must not be \c nullptr.
@@ -62,9 +62,9 @@ public:
*/
virtual void deleteContents();
- int getChildTestCount() const;
+ int getChildTestCount() const override;
- Test *doGetChildTestAt( int index ) const;
+ Test *doGetChildTestAt( int index ) const override;
private:
std::vector<Test *> m_tests;
diff --git a/include/cppunit/TextOutputter.h b/include/cppunit/TextOutputter.h
index 6bd9cea..ee63556 100644
--- a/include/cppunit/TextOutputter.h
+++ b/include/cppunit/TextOutputter.h
@@ -24,9 +24,9 @@ public:
OStream &stream );
/// Destructor.
- virtual ~TextOutputter();
+ virtual ~TextOutputter() override;
- void write();
+ void write() override;
virtual void printFailures();
virtual void printHeader();
diff --git a/include/cppunit/TextTestProgressListener.h b/include/cppunit/TextTestProgressListener.h
index 7521c40..090ea3e 100644
--- a/include/cppunit/TextTestProgressListener.h
+++ b/include/cppunit/TextTestProgressListener.h
@@ -19,14 +19,14 @@ public:
TextTestProgressListener();
/// Destructor.
- virtual ~TextTestProgressListener();
+ virtual ~TextTestProgressListener() override;
- void startTest( Test *test );
+ void startTest( Test *test ) override;
- void addFailure( const TestFailure &failure );
+ void addFailure( const TestFailure &failure ) override;
void endTestRun( Test *test,
- TestResult *eventManager );
+ TestResult *eventManager ) override;
private:
/// Prevents the use of the copy constructor.
diff --git a/include/cppunit/TextTestResult.h b/include/cppunit/TextTestResult.h
index 63937b0..4f9807e 100644
--- a/include/cppunit/TextTestResult.h
+++ b/include/cppunit/TextTestResult.h
@@ -23,8 +23,8 @@ class CPPUNIT_API TextTestResult : public TestResult,
public:
TextTestResult();
- virtual void addFailure( const TestFailure &failure );
- virtual void startTest( Test *test );
+ virtual void addFailure( const TestFailure &failure ) override;
+ virtual void startTest( Test *test ) override;
virtual void print( OStream &stream );
using TestResult::addFailure;
diff --git a/include/cppunit/XmlOutputter.h b/include/cppunit/XmlOutputter.h
index 36fe954..3c705f3 100644
--- a/include/cppunit/XmlOutputter.h
+++ b/include/cppunit/XmlOutputter.h
@@ -49,7 +49,7 @@ public:
const std::string& encoding = std::string("ISO-8859-1") );
/// Destructor.
- virtual ~XmlOutputter();
+ virtual ~XmlOutputter() override;
/*! \brief Adds the specified hook to the outputter.
* \param hook Hook to add. Must not be \c nullptr.
@@ -66,7 +66,7 @@ public:
* Refer to examples/cppunittest/XmlOutputterTest.cpp for example
* of use and XML document structure.
*/
- virtual void write();
+ virtual void write() override;
/*! \brief Sets the XSL style sheet used.
*
diff --git a/include/cppunit/extensions/RepeatedTest.h b/include/cppunit/extensions/RepeatedTest.h
index 390ce48..d379201 100644
--- a/include/cppunit/extensions/RepeatedTest.h
+++ b/include/cppunit/extensions/RepeatedTest.h
@@ -25,9 +25,9 @@ public:
{
}
- void run( TestResult *result );
+ void run( TestResult *result ) override;
- int countTestCases() const;
+ int countTestCases() const override;
private:
RepeatedTest( const RepeatedTest & );
diff --git a/include/cppunit/extensions/TestCaseDecorator.h b/include/cppunit/extensions/TestCaseDecorator.h
index effde25..a7d98f7 100644
--- a/include/cppunit/extensions/TestCaseDecorator.h
+++ b/include/cppunit/extensions/TestCaseDecorator.h
@@ -19,15 +19,15 @@ class CPPUNIT_API TestCaseDecorator : public TestCase
{
public:
TestCaseDecorator( TestCase *test );
- ~TestCaseDecorator();
+ ~TestCaseDecorator() override;
- std::string getName() const;
+ std::string getName() const override;
- void setUp();
+ void setUp() override;
- void tearDown();
+ void tearDown() override;
- void runTest();
+ void runTest() override;
protected:
TestCase *m_test;
diff --git a/include/cppunit/extensions/TestDecorator.h b/include/cppunit/extensions/TestDecorator.h
index 1c63b63..18565a2 100644
--- a/include/cppunit/extensions/TestDecorator.h
+++ b/include/cppunit/extensions/TestDecorator.h
@@ -22,18 +22,18 @@ class CPPUNIT_API TestDecorator : public Test
{
public:
TestDecorator( Test *test );
- ~TestDecorator();
+ ~TestDecorator() override;
- int countTestCases() const;
+ int countTestCases() const override;
- std::string getName() const;
+ std::string getName() const override;
- void run( TestResult *result );
+ void run( TestResult *result ) override;
- int getChildTestCount() const;
+ int getChildTestCount() const override;
protected:
- Test *doGetChildTestAt( int index ) const;
+ Test *doGetChildTestAt( int index ) const override;
Test *m_test;
diff --git a/include/cppunit/extensions/TestFactoryRegistry.h b/include/cppunit/extensions/TestFactoryRegistry.h
index 9d10c94..cb7271e 100644
--- a/include/cppunit/extensions/TestFactoryRegistry.h
+++ b/include/cppunit/extensions/TestFactoryRegistry.h
@@ -82,13 +82,13 @@ public:
TestFactoryRegistry( std::string name );
/// Destructor.
- virtual ~TestFactoryRegistry();
+ virtual ~TestFactoryRegistry() override;
/** Returns a new TestSuite that contains the registered test.
* \return A new TestSuite which contains all the test added using
* registerFactory(TestFactory *).
*/
- virtual Test *makeTest();
+ virtual Test *makeTest() override;
/** Returns a named registry.
*
diff --git a/include/cppunit/extensions/TestSetUp.h b/include/cppunit/extensions/TestSetUp.h
index f2128ec..22e74d8 100644
--- a/include/cppunit/extensions/TestSetUp.h
+++ b/include/cppunit/extensions/TestSetUp.h
@@ -16,7 +16,7 @@ class CPPUNIT_API TestSetUp : public TestDecorator
public:
TestSetUp( Test *test );
- void run( TestResult *result );
+ void run( TestResult *result ) override;
protected:
virtual void setUp();
diff --git a/include/cppunit/plugin/DynamicLibraryManagerException.h b/include/cppunit/plugin/DynamicLibraryManagerException.h
index 11ebbd9..74199ff 100644
--- a/include/cppunit/plugin/DynamicLibraryManagerException.h
+++ b/include/cppunit/plugin/DynamicLibraryManagerException.h
@@ -38,7 +38,7 @@ public:
Cause getCause() const;
- const char *what() const throw();
+ const char *what() const throw() override;
private:
std::string m_message;
diff --git a/include/cppunit/plugin/TestPlugInDefaultImpl.h b/include/cppunit/plugin/TestPlugInDefaultImpl.h
index 8040b79..21923f1 100644
--- a/include/cppunit/plugin/TestPlugInDefaultImpl.h
+++ b/include/cppunit/plugin/TestPlugInDefaultImpl.h
@@ -33,20 +33,20 @@ class CPPUNIT_API TestPlugInDefaultImpl : public CppUnitTestPlugIn
public:
TestPlugInDefaultImpl();
- virtual ~TestPlugInDefaultImpl();
+ virtual ~TestPlugInDefaultImpl() override;
void initialize( TestFactoryRegistry *registry,
- const PlugInParameters &parameters );
+ const PlugInParameters &parameters ) override;
- void addListener( TestResult *eventManager );
+ void addListener( TestResult *eventManager ) override;
- void removeListener( TestResult *eventManager );
+ void removeListener( TestResult *eventManager ) override;
- void addXmlOutputterHooks( XmlOutputter *outputter );
+ void addXmlOutputterHooks( XmlOutputter *outputter ) override;
- void removeXmlOutputterHooks();
+ void removeXmlOutputterHooks() override;
- void uninitialize( TestFactoryRegistry *registry );
+ void uninitialize( TestFactoryRegistry *registry ) override;
};
diff --git a/include/cppunit/ui/text/TextTestRunner.h b/include/cppunit/ui/text/TextTestRunner.h
index 25fc717..563a9a8 100644
--- a/include/cppunit/ui/text/TextTestRunner.h
+++ b/include/cppunit/ui/text/TextTestRunner.h
@@ -65,7 +65,7 @@ class CPPUNIT_API TextTestRunner : public CPPUNIT_NS::TestRunner
public:
TextTestRunner( Outputter *outputter = nullptr );
- virtual ~TextTestRunner();
+ virtual ~TextTestRunner() override;
bool run( std::string testPath ="",
bool doWait = false,
@@ -80,7 +80,7 @@ public:
public: // overridden from TestRunner (to avoid hidden virtual function warning)
virtual void run( TestResult &controller,
- const std::string &testPath = "" );
+ const std::string &testPath = "" ) override;
protected:
virtual void wait( bool doWait );
diff --git a/src/cppunit/DefaultProtector.h b/src/cppunit/DefaultProtector.h
index 4a76ea0..8176f39 100644
--- a/src/cppunit/DefaultProtector.h
+++ b/src/cppunit/DefaultProtector.h
@@ -18,7 +18,7 @@ class DefaultProtector : public Protector
{
public:
bool protect( const Functor &functor,
- const ProtectorContext &context );
+ const ProtectorContext &context ) override;
};
CPPUNIT_NS_END
diff --git a/src/cppunit/ProtectorChain.cpp b/src/cppunit/ProtectorChain.cpp
index db7744a..c953447 100644
--- a/src/cppunit/ProtectorChain.cpp
+++ b/src/cppunit/ProtectorChain.cpp
@@ -15,7 +15,7 @@ public:
{
}
- bool operator()() const
+ bool operator()() const override
{
return m_protector->protect( m_functor, m_context );
}
diff --git a/src/cppunit/ProtectorChain.h b/src/cppunit/ProtectorChain.h
index 9123782..e798a96 100644
--- a/src/cppunit/ProtectorChain.h
+++ b/src/cppunit/ProtectorChain.h
@@ -21,7 +21,7 @@ class CPPUNIT_API ProtectorChain : public Protector
public:
ProtectorChain();
- ~ProtectorChain();
+ ~ProtectorChain() override;
void push( Protector *protector );
@@ -30,7 +30,7 @@ public:
int count() const;
bool protect( const Functor &functor,
- const ProtectorContext &context );
+ const ProtectorContext &context ) override;
private:
class ProtectFunctor;
diff --git a/src/cppunit/TestCase.cpp b/src/cppunit/TestCase.cpp
index 431a0c5..31fcefa 100644
--- a/src/cppunit/TestCase.cpp
+++ b/src/cppunit/TestCase.cpp
@@ -27,7 +27,7 @@ public:
{
}
- bool operator()() const
+ bool operator()() const override
{
(m_target->*m_method)();
return true;