summaryrefslogtreecommitdiffstats
path: root/searchsummary/src/tests
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-04-12 11:52:52 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-04-12 12:35:30 +0200
commita5fb97673ce7351bd2921c4cb507e51cb85d9bce (patch)
tree675d98df0e929d04fd57585fe14d839729bfe07d /searchsummary/src/tests
parent209472f6181b51c920b50d81e4ec76007a9a5118 (diff)
add override in searchsummary module
Diffstat (limited to 'searchsummary/src/tests')
-rw-r--r--searchsummary/src/tests/docsumformat/docsum-pack.cpp2
-rw-r--r--searchsummary/src/tests/docsummary/positionsdfw_test.cpp30
-rw-r--r--searchsummary/src/tests/extractkeywords/extractkeywordstest.h2
3 files changed, 17 insertions, 17 deletions
diff --git a/searchsummary/src/tests/docsumformat/docsum-pack.cpp b/searchsummary/src/tests/docsumformat/docsum-pack.cpp
index bb01027d116..36ef5706355 100644
--- a/searchsummary/src/tests/docsumformat/docsum-pack.cpp
+++ b/searchsummary/src/tests/docsumformat/docsum-pack.cpp
@@ -63,7 +63,7 @@ public:
void TestBasicInplace();
void TestCompressInplace();
- int Main();
+ int Main() override;
};
MyApp::MyApp()
diff --git a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
index 1892fa96179..8f900700d5d 100644
--- a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
+++ b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
@@ -33,7 +33,7 @@ class Test : public vespalib::TestApp {
void requireThat2DPositionFieldIsWritten();
public:
- int Main();
+ int Main() override;
};
int
@@ -51,21 +51,21 @@ struct MyEnvironment : IDocsumEnvironment {
MyEnvironment() : attribute_man(0) {}
- virtual IAttributeManager *getAttributeManager() { return attribute_man; }
- virtual string lookupIndex(const string &s) const { return s; }
- virtual juniper::Juniper *getJuniper() { return 0; }
+ virtual IAttributeManager *getAttributeManager() override { return attribute_man; }
+ virtual string lookupIndex(const string &s) const override { return s; }
+ virtual juniper::Juniper *getJuniper() override { return 0; }
};
class MyAttributeContext : public IAttributeContext {
const IAttributeVector &_attr;
public:
MyAttributeContext(const IAttributeVector &attr) : _attr(attr) {}
- virtual const IAttributeVector *getAttribute(const string &) const {
+ virtual const IAttributeVector *getAttribute(const string &) const override {
return &_attr;
}
- virtual const IAttributeVector *getAttributeStableEnum(
- const string &) const { abort(); }
- virtual void getAttributeList(vector<const IAttributeVector *> &) const
+ virtual const IAttributeVector *
+ getAttributeStableEnum(const string &) const override { abort(); }
+ virtual void getAttributeList(vector<const IAttributeVector *> &) const override
{ abort(); }
};
@@ -74,24 +74,24 @@ class MyAttributeManager : public IAttributeManager {
public:
MyAttributeManager(const IAttributeVector &attr) : _attr(attr) {}
- virtual AttributeGuard::UP getAttribute(const string &) const {
+ virtual AttributeGuard::UP getAttribute(const string &) const override {
abort();
}
- virtual AttributeGuard::UP getAttributeStableEnum(const string &) const {
+ virtual AttributeGuard::UP getAttributeStableEnum(const string &) const override {
abort();
}
- virtual void getAttributeList(vector<AttributeGuard> &) const {
+ virtual void getAttributeList(vector<AttributeGuard> &) const override {
abort();
}
- virtual IAttributeContext::UP createContext() const {
+ virtual IAttributeContext::UP createContext() const override {
return IAttributeContext::UP(new MyAttributeContext(_attr));
}
};
struct MyGetDocsumsStateCallback : GetDocsumsStateCallback {
- virtual void FillSummaryFeatures(GetDocsumsState *, IDocsumEnvironment *) {}
- virtual void FillRankFeatures(GetDocsumsState *, IDocsumEnvironment *) {}
- virtual void ParseLocation(GetDocsumsState *) {}
+ virtual void FillSummaryFeatures(GetDocsumsState *, IDocsumEnvironment *) override {}
+ virtual void FillRankFeatures(GetDocsumsState *, IDocsumEnvironment *) override {}
+ virtual void ParseLocation(GetDocsumsState *) override {}
};
template <typename AttrType>
diff --git a/searchsummary/src/tests/extractkeywords/extractkeywordstest.h b/searchsummary/src/tests/extractkeywords/extractkeywordstest.h
index 9e9ba3ac09c..2b24ce39136 100644
--- a/searchsummary/src/tests/extractkeywords/extractkeywordstest.h
+++ b/searchsummary/src/tests/extractkeywords/extractkeywordstest.h
@@ -19,7 +19,7 @@ private:
search::docsummary::KeywordExtractor *_extractor;
- int Main();
+ int Main() override;
void Usage(char *progname);
bool ShowResult(int testNo, const char *actual, const char *correct);
bool RunTest(int i, bool verify);