summaryrefslogtreecommitdiffstats
path: root/memfilepersistence/src/tests/spi
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-04-10 15:57:17 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-04-10 15:57:17 +0200
commit0c8336a1abefc49c646d89394aa36a78e4d442b6 (patch)
tree784f22fec0c8c6c2addaa37f757f81e8c7745fdd /memfilepersistence/src/tests/spi
parent41bfa111fb9186b365ecf4b2cdae654cef8a86b5 (diff)
add override in memfilepersistence module
Diffstat (limited to 'memfilepersistence/src/tests/spi')
-rw-r--r--memfilepersistence/src/tests/spi/iteratorhandlertest.cpp4
-rw-r--r--memfilepersistence/src/tests/spi/memcachetest.cpp2
-rw-r--r--memfilepersistence/src/tests/spi/memfileautorepairtest.cpp4
-rw-r--r--memfilepersistence/src/tests/spi/memfilev1serializertest.cpp34
-rw-r--r--memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp2
-rw-r--r--memfilepersistence/src/tests/spi/providerconformancetest.cpp2
-rw-r--r--memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp14
-rw-r--r--memfilepersistence/src/tests/spi/simulatedfailurefile.h6
8 files changed, 33 insertions, 35 deletions
diff --git a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
index b34adc7fa8f..673a72068b7 100644
--- a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
+++ b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
@@ -58,8 +58,8 @@ public:
void testCachePrefetchRequirements();
void testBucketEvictedFromCacheOnIterateException();
- void setUp();
- void tearDown();
+ void setUp() override;
+ void tearDown() override;
struct Chunk
{
diff --git a/memfilepersistence/src/tests/spi/memcachetest.cpp b/memfilepersistence/src/tests/spi/memcachetest.cpp
index 939f116b88d..07697b79cac 100644
--- a/memfilepersistence/src/tests/spi/memcachetest.cpp
+++ b/memfilepersistence/src/tests/spi/memcachetest.cpp
@@ -130,7 +130,7 @@ private:
}
public:
- void tearDown() {
+ void tearDown() override {
_cache.reset(0);
_metrics.reset(0);
_component.reset(0);
diff --git a/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp b/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
index 32fc9096963..eefe962979d 100644
--- a/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
+++ b/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
@@ -15,8 +15,8 @@ namespace memfile {
class MemFileAutoRepairTest : public SingleDiskMemFileTestUtils
{
public:
- void setUp();
- void tearDown();
+ void setUp() override;
+ void tearDown() override;
void testFileMetadataCorruptionIsAutoRepaired();
void testDocumentContentCorruptionIsAutoRepaired();
diff --git a/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp b/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp
index a5d1c50d043..ad20a28ed0c 100644
--- a/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp
+++ b/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp
@@ -15,7 +15,7 @@ namespace memfile {
struct MemFileV1SerializerTest : public SingleDiskMemFileTestUtils
{
- void tearDown();
+ void tearDown() override;
void setUpPartialWriteEnvironment();
void resetConfig(uint32_t minimumFileSize, uint32_t minimumFileHeaderBlockSize);
void doTestPartialWriteRemove(bool readAll);
@@ -204,50 +204,50 @@ MemFileV1SerializerTest::resetConfig(uint32_t minimumFileSize,
struct DummyMemFileIOInterface : MemFileIOInterface {
Document::UP getDocumentHeader(const document::DocumentTypeRepo&,
- DataLocation) const
+ DataLocation) const override
{
return Document::UP();
}
- document::DocumentId getDocumentId(DataLocation) const {
+ document::DocumentId getDocumentId(DataLocation) const override {
return document::DocumentId("");
}
void readBody(const document::DocumentTypeRepo&,
DataLocation,
- Document&) const
+ Document&) const override
{
}
DataLocation addDocumentIdOnlyHeader(
const DocumentId&,
- const document::DocumentTypeRepo&)
+ const document::DocumentTypeRepo&) override
{
return DataLocation();
}
- DataLocation addHeader(const Document&) { return DataLocation(); }
- DataLocation addBody(const Document&) { return DataLocation(); }
- void clear(DocumentPart) {}
- bool verifyConsistent() const { return true; }
- void move(const FileSpecification&) {}
+ DataLocation addHeader(const Document&) override { return DataLocation(); }
+ DataLocation addBody(const Document&) override { return DataLocation(); }
+ void clear(DocumentPart) override {}
+ bool verifyConsistent() const override { return true; }
+ void move(const FileSpecification&) override {}
DataLocation copyCache(const MemFileIOInterface&,
DocumentPart,
- DataLocation)
+ DataLocation) override
{
return DataLocation();
}
- void close() {};
- bool isCached(DataLocation, DocumentPart) const { return false; }
- bool isPersisted(DataLocation, DocumentPart) const { return false; }
+ void close() override {}
+ bool isCached(DataLocation, DocumentPart) const override { return false; }
+ bool isPersisted(DataLocation, DocumentPart) const override { return false; }
uint32_t getSerializedSize(DocumentPart,
- DataLocation) const { return 0; }
+ DataLocation) const override { return 0; }
void ensureCached(Environment&,
DocumentPart,
- const std::vector<DataLocation>&)
+ const std::vector<DataLocation>&) override
{}
- size_t getCachedSize(DocumentPart) const { return 0; }
+ size_t getCachedSize(DocumentPart) const override { return 0; }
};
#define VESPA_MEMFILEV1_SETUP_SOURCE \
diff --git a/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp b/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp
index 0cf04eadaa2..51951e22aea 100644
--- a/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp
+++ b/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp
@@ -17,7 +17,7 @@ struct MemFileV1VerifierTest : public SingleDiskMemFileTestUtils
{
void testVerify();
- void tearDown();
+ void tearDown() override;
std::unique_ptr<MemFile> createMemFile(FileSpecification& file,
bool callLoadFile)
diff --git a/memfilepersistence/src/tests/spi/providerconformancetest.cpp b/memfilepersistence/src/tests/spi/providerconformancetest.cpp
index 526f61a812c..8bc2237265b 100644
--- a/memfilepersistence/src/tests/spi/providerconformancetest.cpp
+++ b/memfilepersistence/src/tests/spi/providerconformancetest.cpp
@@ -39,7 +39,7 @@ struct ProviderConformanceTest : public spi::ConformanceTest {
spi::PersistenceProvider::UP
getPersistenceImplementation(const document::DocumentTypeRepo::SP& repo,
- const document::DocumenttypesConfig&)
+ const document::DocumenttypesConfig&) override
{
system("rm -rf vdsroot");
system("mkdir -p vdsroot/disks/d0");
diff --git a/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp b/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp
index 3eac7b57e81..ffe7972552f 100644
--- a/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp
+++ b/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp
@@ -51,21 +51,19 @@ class SimpleMemFileIOBufferTest : public SingleDiskMemFileTestUtils
public:
class DummyFileReader : public VersionSerializer {
public:
- virtual FileVersion getFileVersion() { return FileVersion(); }
- virtual void loadFile(MemFile&, Environment&,
- Buffer&, uint64_t ) {}
- virtual FlushResult flushUpdatesToFile(MemFile&, Environment&) {
+ virtual FileVersion getFileVersion() override { return FileVersion(); }
+ virtual void loadFile(MemFile&, Environment&, Buffer&, uint64_t ) override {}
+ virtual FlushResult flushUpdatesToFile(MemFile&, Environment&) override {
return FlushResult::TooSmall;
}
- virtual void rewriteFile(MemFile&, Environment&) {}
+ virtual void rewriteFile(MemFile&, Environment&) override {}
virtual bool verify(MemFile&, Environment&,
- std::ostream&, bool,
- uint16_t) { return false; };
+ std::ostream&, bool, uint16_t) override { return false; };
virtual void cacheLocations(MemFileIOInterface&,
Environment&,
const Options&,
DocumentPart,
- const std::vector<DataLocation>&) {}
+ const std::vector<DataLocation>&) override {}
};
DummyFileReader dfr;
diff --git a/memfilepersistence/src/tests/spi/simulatedfailurefile.h b/memfilepersistence/src/tests/spi/simulatedfailurefile.h
index 825c9f53585..515b70e5e5a 100644
--- a/memfilepersistence/src/tests/spi/simulatedfailurefile.h
+++ b/memfilepersistence/src/tests/spi/simulatedfailurefile.h
@@ -18,7 +18,7 @@ public:
: _readOpsBeforeFailure(-1),
_writeOpsBeforeFailure(0)
{ }
- vespalib::LazyFile::UP createFile(const std::string& fileName) const;
+ vespalib::LazyFile::UP createFile(const std::string& fileName) const override;
void setReadOpsBeforeFailure(int ops) {
_readOpsBeforeFailure = ops;
@@ -38,8 +38,8 @@ public:
int readOpsBeforeFailure,
int writeOpsBeforeFailure);
- off_t write(const void *buf, size_t bufsize, off_t offset);
- size_t read(void *buf, size_t bufsize, off_t offset) const;
+ off_t write(const void *buf, size_t bufsize, off_t offset) override;
+ size_t read(void *buf, size_t bufsize, off_t offset) const override;
};
} // ns memfile