aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests/proton
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@yahoo-inc.com>2017-05-24 10:09:49 +0000
committerTor Egge <Tor.Egge@yahoo-inc.com>2017-05-24 10:09:49 +0000
commitadbf51ef6537c663317886a31d908a0ef0e5269d (patch)
tree193e388361b8942100fe9120a5594c3512180a17 /searchcore/src/tests/proton
parent67739bd0d1d78e5d27400139b7742c32662f39d8 (diff)
C++ style fix: Use foo() instead of foo(void)
Diffstat (limited to 'searchcore/src/tests/proton')
-rw-r--r--searchcore/src/tests/proton/attribute/attributeflush_test.cpp38
-rw-r--r--searchcore/src/tests/proton/common/cachedselect_test.cpp12
-rw-r--r--searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp4
-rw-r--r--searchcore/src/tests/proton/common/selectpruner_test.cpp10
-rw-r--r--searchcore/src/tests/proton/docsummary/docsummary.cpp6
-rw-r--r--searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp4
-rw-r--r--searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp2
-rw-r--r--searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp4
-rw-r--r--searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp2
-rw-r--r--searchcore/src/tests/proton/flushengine/flushengine.cpp4
-rw-r--r--searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp2
11 files changed, 44 insertions, 44 deletions
diff --git a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
index 95d0492263d..a3b5d6dd2fb 100644
--- a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
@@ -54,7 +54,7 @@ public:
}
virtual void
- run(void) override
+ run() override
{
_task->run();
_gate->countDown();
@@ -104,7 +104,7 @@ public:
startFlushing(uint64_t syncToken, FlushHandler & handler);
void
- run(void);
+ run();
};
@@ -119,7 +119,7 @@ UpdaterTask::startFlushing(uint64_t syncToken, FlushHandler & handler)
void
-UpdaterTask::run(void)
+UpdaterTask::run()
{
LOG(info, "UpdaterTask::run(begin)");
uint32_t totalDocs = 2000000;
@@ -195,28 +195,28 @@ class Test : public vespalib::TestApp
{
private:
void
- requireThatUpdaterAndFlusherCanRunConcurrently(void);
+ requireThatUpdaterAndFlusherCanRunConcurrently();
void
- requireThatFlushableAttributeReportsMemoryUsage(void);
+ requireThatFlushableAttributeReportsMemoryUsage();
void
requireThatFlushableAttributeManagesSyncTokenInfo();
void
- requireThatFlushTargetsCanBeRetrieved(void);
+ requireThatFlushTargetsCanBeRetrieved();
void
- requireThatCleanUpIsPerformedAfterFlush(void);
+ requireThatCleanUpIsPerformedAfterFlush();
void
- requireThatFlushStatsAreUpdated(void);
+ requireThatFlushStatsAreUpdated();
void
- requireThatOnlyOneFlusherCanRunAtTheSameTime(void);
+ requireThatOnlyOneFlusherCanRunAtTheSameTime();
void
- requireThatLastFlushTimeIsReported(void);
+ requireThatLastFlushTimeIsReported();
void
requireThatShrinkWorks();
@@ -225,7 +225,7 @@ private:
void requireThatFlushedAttributeCanBeLoaded();
public:
int
- Main(void) override;
+ Main() override;
};
@@ -298,7 +298,7 @@ struct Fixture : public BaseFixture, public AttributeManagerFixture
void
-Test::requireThatUpdaterAndFlusherCanRunConcurrently(void)
+Test::requireThatUpdaterAndFlusherCanRunConcurrently()
{
Fixture f;
AttributeManager &am = f._m;
@@ -330,7 +330,7 @@ Test::requireThatUpdaterAndFlusherCanRunConcurrently(void)
void
-Test::requireThatFlushableAttributeReportsMemoryUsage(void)
+Test::requireThatFlushableAttributeReportsMemoryUsage()
{
Fixture f;
AttributeManager &am = f._m;
@@ -383,7 +383,7 @@ Test::requireThatFlushableAttributeManagesSyncTokenInfo()
void
-Test::requireThatFlushTargetsCanBeRetrieved(void)
+Test::requireThatFlushTargetsCanBeRetrieved()
{
Fixture f;
AttributeManager &am = f._m;
@@ -399,7 +399,7 @@ Test::requireThatFlushTargetsCanBeRetrieved(void)
void
-Test::requireThatCleanUpIsPerformedAfterFlush(void)
+Test::requireThatCleanUpIsPerformedAfterFlush()
{
Fixture f;
AttributeVector::SP av = f.addAttribute("a6");
@@ -435,7 +435,7 @@ Test::requireThatCleanUpIsPerformedAfterFlush(void)
void
-Test::requireThatFlushStatsAreUpdated(void)
+Test::requireThatFlushStatsAreUpdated()
{
Fixture f;
AttributeManager &am = f._m;
@@ -451,7 +451,7 @@ Test::requireThatFlushStatsAreUpdated(void)
void
-Test::requireThatOnlyOneFlusherCanRunAtTheSameTime(void)
+Test::requireThatOnlyOneFlusherCanRunAtTheSameTime()
{
Fixture f;
AttributeManager &am = f._m;
@@ -484,7 +484,7 @@ Test::requireThatOnlyOneFlusherCanRunAtTheSameTime(void)
void
-Test::requireThatLastFlushTimeIsReported(void)
+Test::requireThatLastFlushTimeIsReported()
{
BaseFixture f;
FastOS_StatInfo stat;
@@ -610,7 +610,7 @@ Test::requireThatFlushedAttributeCanBeLoaded()
}
int
-Test::Main(void)
+Test::Main()
{
TEST_INIT("attributeflush_test");
diff --git a/searchcore/src/tests/proton/common/cachedselect_test.cpp b/searchcore/src/tests/proton/common/cachedselect_test.cpp
index 6d1f7735479..fb5e40767ab 100644
--- a/searchcore/src/tests/proton/common/cachedselect_test.cpp
+++ b/searchcore/src/tests/proton/common/cachedselect_test.cpp
@@ -88,7 +88,7 @@ const int32_t noIntVal = std::numeric_limits<int32_t>::min();
DocumentTypeRepo::UP
-makeDocTypeRepo(void)
+makeDocTypeRepo()
{
DocumenttypesConfigBuilderHelper builder;
builder.document(doc_type_id, type_name,
@@ -194,7 +194,7 @@ public:
}
uint32_t
- getGets(void) const
+ getGets() const
{
return _gets;
}
@@ -293,9 +293,9 @@ public:
MyAttributeManager _amgr;
MyDB::UP _db;
- TestFixture(void);
+ TestFixture();
- ~TestFixture(void);
+ ~TestFixture();
CachedSelect::SP
testParse(const string &selection,
@@ -304,7 +304,7 @@ public:
};
-TestFixture::TestFixture(void)
+TestFixture::TestFixture()
: _repoUP(),
_hasFields(true),
_amgr(),
@@ -320,7 +320,7 @@ TestFixture::TestFixture(void)
}
-TestFixture::~TestFixture(void)
+TestFixture::~TestFixture()
{
}
diff --git a/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp b/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp
index e323ef6fe8f..330d1cf0462 100644
--- a/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp
+++ b/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp
@@ -16,7 +16,7 @@ const vespalib::string header_name = type_name + ".header";
const vespalib::string body_name = type_name + ".body";
DocumentTypeRepo::UP
-makeOldDocTypeRepo(void)
+makeOldDocTypeRepo()
{
DocumenttypesConfigBuilderHelper builder;
builder.document(doc_type_id, type_name,
@@ -29,7 +29,7 @@ makeOldDocTypeRepo(void)
}
DocumentTypeRepo::UP
-makeNewDocTypeRepo(void)
+makeNewDocTypeRepo()
{
DocumenttypesConfigBuilderHelper builder;
builder.document(doc_type_id, type_name,
diff --git a/searchcore/src/tests/proton/common/selectpruner_test.cpp b/searchcore/src/tests/proton/common/selectpruner_test.cpp
index e167979d065..ee8dbf06d9d 100644
--- a/searchcore/src/tests/proton/common/selectpruner_test.cpp
+++ b/searchcore/src/tests/proton/common/selectpruner_test.cpp
@@ -60,7 +60,7 @@ const document::DocumentId docId("doc:test:1");
DocumentTypeRepo::UP
-makeDocTypeRepo(void)
+makeDocTypeRepo()
{
DocumenttypesConfigBuilderHelper builder;
builder.document(doc_type_id, type_name,
@@ -131,9 +131,9 @@ public:
DocumentTypeRepo::UP _repoUP;
bool _hasFields;
- TestFixture(void);
+ TestFixture();
- ~TestFixture(void);
+ ~TestFixture();
void
testParse(const string &selection);
@@ -152,7 +152,7 @@ public:
};
-TestFixture::TestFixture(void)
+TestFixture::TestFixture()
: _amgr(),
_repoUP(),
_hasFields(true)
@@ -164,7 +164,7 @@ TestFixture::TestFixture(void)
}
-TestFixture::~TestFixture(void)
+TestFixture::~TestFixture()
{
}
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index d7311a2cc63..5567eb970bb 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -106,7 +106,7 @@ public:
{
}
- ~BuildContext(void)
+ ~BuildContext()
{
}
@@ -126,7 +126,7 @@ public:
namespace {
const char *
-getDocTypeName(void)
+getDocTypeName()
{
return "searchdocument";
}
@@ -306,7 +306,7 @@ private:
}
const std::set<vespalib::string> &
- getMarkupFields(void) const
+ getMarkupFields() const
{
return _markupFields;
}
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index 67eccb2fed2..351c4a3d405 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -111,7 +111,7 @@ struct MyOwner : public IFeedHandlerOwner
virtual void onPerformPrune(SerialNum) override {}
virtual bool
- getAllowPrune(void) const override
+ getAllowPrune() const override
{
return _allowPrune;
}
@@ -394,7 +394,7 @@ struct MyFeedMetrics : public metrics::MetricSet
{
PerDocTypeFeedMetrics _feed;
- MyFeedMetrics(void)
+ MyFeedMetrics()
: metrics::MetricSet("myfeedmetrics", "", "My feed metrics", NULL),
_feed(this)
{
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
index 4fd2f7f0332..10d8cc8c3a2 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
@@ -63,7 +63,7 @@ saveBaseConfigSnapshot(const DocumentDBConfig &snap, SerialNum num)
DocumentDBConfig::SP
-makeEmptyConfigSnapshot(void)
+makeEmptyConfigSnapshot()
{
return test::DocumentDBConfigBuilder(0, std::make_shared<Schema>(), "client", "test").build();
}
diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
index fc22a629f23..ef994989a7b 100644
--- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
+++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
@@ -69,7 +69,7 @@ class ReverseGidCompare : public DocumentMetaStore::IGidCompare
{
GlobalId::BucketOrderCmp _comp;
public:
- ReverseGidCompare(void)
+ ReverseGidCompare()
: IGidCompare(),
_comp()
{
@@ -90,7 +90,7 @@ struct BoolVector : public std::vector<bool> {
BoolVector &F() { push_back(false); return *this; }
uint32_t
- countTrue(void) const
+ countTrue() const
{
uint32_t res(0);
for (uint32_t i = 0; i < size(); ++i)
diff --git a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
index 9c17b904eed..6077ca5fe76 100644
--- a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
+++ b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
@@ -94,7 +94,7 @@ void assertDocumentOperation(DocumentOperation &op, BucketId expBucket, uint32_t
}
DocumentTypeRepo::UP
-makeDocTypeRepo(void)
+makeDocTypeRepo()
{
DocumenttypesConfigBuilderHelper builder;
builder.document(doc_type_id, type_name,
diff --git a/searchcore/src/tests/proton/flushengine/flushengine.cpp b/searchcore/src/tests/proton/flushengine/flushengine.cpp
index 7de03c665a7..57302834441 100644
--- a/searchcore/src/tests/proton/flushengine/flushengine.cpp
+++ b/searchcore/src/tests/proton/flushengine/flushengine.cpp
@@ -231,7 +231,7 @@ public:
}
virtual search::SerialNum
- getFlushSerial(void) const override
+ getFlushSerial() const override
{
return 0u;
}
@@ -421,7 +421,7 @@ public:
_done.countDown();
}
virtual search::SerialNum
- getFlushSerial(void) const override
+ getFlushSerial() const override
{
return 0u;
}
diff --git a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp
index 4d9cbd307ba..73a849c6211 100644
--- a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp
+++ b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp
@@ -54,7 +54,7 @@ struct MyTask : public IReprocessingTask
}
virtual Progress
- getProgress(void) const override
+ getProgress() const override
{
return Progress(_myProgress, _weight);
}