diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-11 11:46:01 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-11 11:46:01 +0200 |
commit | 689541432c21eea3a3d612726974d008676be8ae (patch) | |
tree | 8e78c62438aa61ac93feda3a473dc70c2379d8db /storage/src/tests/storageserver | |
parent | a7747a035821de936c9bf9eba05c2c9c4ac1291f (diff) |
add override in storage tests
Diffstat (limited to 'storage/src/tests/storageserver')
8 files changed, 18 insertions, 18 deletions
diff --git a/storage/src/tests/storageserver/bouncertest.cpp b/storage/src/tests/storageserver/bouncertest.cpp index f00e4b19c31..e5b9a3e6092 100644 --- a/storage/src/tests/storageserver/bouncertest.cpp +++ b/storage/src/tests/storageserver/bouncertest.cpp @@ -25,8 +25,8 @@ struct BouncerTest : public CppUnit::TestFixture { BouncerTest(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testFutureTimestamp(); void testAllowNotifyBucketChangeEvenWhenDistributorDown(); diff --git a/storage/src/tests/storageserver/bucketintegritycheckertest.cpp b/storage/src/tests/storageserver/bucketintegritycheckertest.cpp index 88a5546b174..d9a175f3b04 100644 --- a/storage/src/tests/storageserver/bucketintegritycheckertest.cpp +++ b/storage/src/tests/storageserver/bucketintegritycheckertest.cpp @@ -25,7 +25,7 @@ struct BucketIntegrityCheckerTest : public CppUnit::TestFixture { std::unique_ptr<TestServiceLayerApp> _node; int _timeout; // Timeout in seconds before aborting - void setUp() { + void setUp() override { _timeout = 60*2; _config.reset(new vdstestlib::DirConfig(getStandardConfig(true))); _node.reset(new TestServiceLayerApp(DiskCount(256), @@ -33,7 +33,7 @@ struct BucketIntegrityCheckerTest : public CppUnit::TestFixture { _config->getConfigId())); } - void tearDown() { + void tearDown() override { LOG(info, "Finished test"); } diff --git a/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp b/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp index 3b83d71d8f3..8eb6b74a840 100644 --- a/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp +++ b/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp @@ -119,7 +119,7 @@ public: void testExternalLoadOpAbortUpdatesMetric(); void testExternalLoadOpAbortsAreConfigurable(); - void setUp(); + void setUp() override; }; CPPUNIT_TEST_SUITE_REGISTRATION(ChangedBucketOwnershipHandlerTest); diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp index 5c5c5627feb..1f1198efc3c 100644 --- a/storage/src/tests/storageserver/documentapiconvertertest.cpp +++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp @@ -34,7 +34,7 @@ struct DocumentApiConverterTest : public CppUnit::TestFixture { } - void setUp() { + void setUp() override { _converter.reset(new DocumentApiConverter("raw:")); }; diff --git a/storage/src/tests/storageserver/mergethrottlertest.cpp b/storage/src/tests/storageserver/mergethrottlertest.cpp index a5e637146fc..8a01acd6a68 100644 --- a/storage/src/tests/storageserver/mergethrottlertest.cpp +++ b/storage/src/tests/storageserver/mergethrottlertest.cpp @@ -135,8 +135,8 @@ class MergeThrottlerTest : public CppUnit::TestFixture CPPUNIT_TEST(testNewClusterStateAbortsAllOutdatedActiveMerges); CPPUNIT_TEST_SUITE_END(); public: - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testMergesConfig(); void testChain(); diff --git a/storage/src/tests/storageserver/priorityconvertertest.cpp b/storage/src/tests/storageserver/priorityconvertertest.cpp index ecbdcfb6b91..ecbbd25b8b1 100644 --- a/storage/src/tests/storageserver/priorityconvertertest.cpp +++ b/storage/src/tests/storageserver/priorityconvertertest.cpp @@ -11,7 +11,7 @@ struct PriorityConverterTest : public CppUnit::TestFixture { std::unique_ptr<PriorityConverter> _converter; - void setUp() { + void setUp() override { vdstestlib::DirConfig config(getStandardConfig(true)); _converter.reset(new PriorityConverter(config.getConfigId())); }; diff --git a/storage/src/tests/storageserver/statemanagertest.cpp b/storage/src/tests/storageserver/statemanagertest.cpp index 83fad3a7484..4244ce0c4ce 100644 --- a/storage/src/tests/storageserver/statemanagertest.cpp +++ b/storage/src/tests/storageserver/statemanagertest.cpp @@ -31,8 +31,8 @@ struct StateManagerTest : public CppUnit::TestFixture { StateManagerTest(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testSystemState(); void testReportedNodeState(); @@ -138,7 +138,7 @@ namespace { MyStateListener(const NodeStateUpdater& upd) : updater(upd), current(*updater.getReportedNodeState()) {} - void handleNewState() + void handleNewState() override { ost << current << " -> "; current = *updater.getReportedNodeState(); diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp index 87686f06d6c..265b9e95d83 100644 --- a/storage/src/tests/storageserver/statereportertest.cpp +++ b/storage/src/tests/storageserver/statereportertest.cpp @@ -18,8 +18,8 @@ namespace storage { class DummyApplicationGenerationFether : public ApplicationGenerationFetcher { public: - virtual int64_t getGeneration() const { return 1; } - virtual std::string getComponentName() const { return "component"; } + virtual int64_t getGeneration() const override { return 1; } + virtual std::string getComponentName() const override { return "component"; } }; struct StateReporterTest : public CppUnit::TestFixture { @@ -36,8 +36,8 @@ struct StateReporterTest : public CppUnit::TestFixture { StateReporterTest(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void runLoad(uint32_t count = 1); void testReportConfigGeneration(); @@ -58,9 +58,9 @@ namespace { { framework::Clock& _clock; MetricClock(framework::Clock& c) : _clock(c) {} - virtual time_t getTime() const + virtual time_t getTime() const override { return _clock.getTimeInSeconds().getTime(); } - virtual time_t getTimeInMilliSecs() const + virtual time_t getTimeInMilliSecs() const override { return _clock.getTimeInMillis().getTime(); } }; } |