aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-10-07 11:16:08 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-10-07 11:16:35 +0000
commit9bb9d8e14827ecc4dba2d43e2d9e76248c120e1d (patch)
tree9e64c1471c0391410c824f75e2dc1fbfa8585229 /searchcore/src/tests
parentf2e89d3361cae0e2e74bac89405a175d6ecf5e98 (diff)
Add noexcept as indicated by -Wnoeexcept
Diffstat (limited to 'searchcore/src/tests')
-rw-r--r--searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp2
-rw-r--r--searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp5
-rw-r--r--searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp2
-rw-r--r--searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp4
-rw-r--r--searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp2
-rw-r--r--searchcore/src/tests/proton/flushengine/flushengine_test.cpp4
-rw-r--r--searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp6
-rw-r--r--searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp16
-rw-r--r--searchcore/src/tests/proton/matching/matching_test.cpp2
-rw-r--r--searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp2
-rw-r--r--searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp2
-rw-r--r--searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp46
-rw-r--r--searchcore/src/tests/proton/server/feedstates_test.cpp2
-rw-r--r--searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp29
14 files changed, 45 insertions, 79 deletions
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index b275064c0f2..e6751a0cb98 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -176,7 +176,7 @@ struct MyGidToLidChangeHandler : public MockGidToLidChangeHandler
uint32_t _changes;
std::map<document::GlobalId, uint32_t> _gidToLid;
public:
- MyGidToLidChangeHandler()
+ MyGidToLidChangeHandler() noexcept
: MockGidToLidChangeHandler(),
_changeGid(),
_changeLid(std::numeric_limits<uint32_t>::max()),
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp
index 04444647b5d..8890a6cfdda 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp
@@ -212,11 +212,10 @@ MyDocumentStore::~MyDocumentStore() = default;
struct MyDocumentRetriever : public DocumentRetrieverBaseForTest {
std::shared_ptr<const DocumentTypeRepo> repo;
const MyDocumentStore& store;
- MyDocumentRetriever(std::shared_ptr<const DocumentTypeRepo> repo_in, const MyDocumentStore& store_in)
+ MyDocumentRetriever(std::shared_ptr<const DocumentTypeRepo> repo_in, const MyDocumentStore& store_in) noexcept
: repo(std::move(repo_in)),
store(store_in)
- {
- }
+ {}
const document::DocumentTypeRepo& getDocumentTypeRepo() const override { return *repo; }
void getBucketMetaData(const storage::spi::Bucket&, DocumentMetaData::Vector&) const override { abort(); }
DocumentMetaData getDocumentMetaData(const DocumentId&) const override { abort(); }
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
index 70b2100521f..63c7a873eaf 100644
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
@@ -147,7 +147,7 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest
{
MyDocumentSubDB &_subDB;
- explicit MyDocumentRetriever(MyDocumentSubDB &subDB)
+ explicit MyDocumentRetriever(MyDocumentSubDB &subDB) noexcept
: _subDB(subDB)
{
}
diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
index 8d1276497bd..e6e71d51e47 100644
--- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
@@ -171,7 +171,7 @@ struct MoveOperationFeedView : public MyMinimalFeedView {
struct MoveOperationCallback : public IDestructorCallback {
int &outstandingMoveOps;
- MoveOperationCallback(int &outstandingMoveOps_) : outstandingMoveOps(outstandingMoveOps_) {
+ explicit MoveOperationCallback(int &outstandingMoveOps_) noexcept : outstandingMoveOps(outstandingMoveOps_) {
++outstandingMoveOps;
}
~MoveOperationCallback() override {
@@ -194,7 +194,7 @@ struct FixtureBase {
documentmetastore::LidReuseDelayerConfig lidReuseDelayerConfig;
typename FeedViewType::UP feedview;
- FixtureBase(SubDbType subDbType = SubDbType::READY)
+ explicit FixtureBase(SubDbType subDbType = SubDbType::READY)
: removeCount(0),
putCount(0),
heartbeatCount(0),
diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
index 9ca22bafe9a..60d96e37e15 100644
--- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
+++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
@@ -2090,7 +2090,7 @@ public:
size_t remove_batch_cnt;
size_t remove_cnt;
- MockOperationListener()
+ MockOperationListener() noexcept
: remove_batch_cnt(0),
remove_cnt(0)
{
diff --git a/searchcore/src/tests/proton/flushengine/flushengine_test.cpp b/searchcore/src/tests/proton/flushengine/flushengine_test.cpp
index 08fa1b11229..38fca35ea87 100644
--- a/searchcore/src/tests/proton/flushengine/flushengine_test.cpp
+++ b/searchcore/src/tests/proton/flushengine/flushengine_test.cpp
@@ -361,14 +361,14 @@ public:
public:
typedef std::shared_ptr<SimpleStrategy> SP;
- SimpleStrategy() {}
+ SimpleStrategy() noexcept : _targets() {}
uint32_t
indexOf(const IFlushTarget::SP &target) const
{
IFlushTarget *raw = target.get();
CachedFlushTarget *cached = dynamic_cast<CachedFlushTarget*>(raw);
- if (cached != NULL) {
+ if (cached != nullptr) {
raw = cached->getFlushTarget().get();
}
WrappedFlushTarget *wrapped = dynamic_cast<WrappedFlushTarget *>(raw);
diff --git a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp
index 5f93f97f165..1b8be388c13 100644
--- a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp
+++ b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp
@@ -27,16 +27,16 @@ struct SimpleFlushTarget : public test::DummyFlushTarget
const Type &type,
SerialNum flushedSerial_,
uint64_t approxDiskBytes_,
- double replay_operation_cost_)
+ double replay_operation_cost_) noexcept
: test::DummyFlushTarget(name, type, Component::OTHER),
flushedSerial(flushedSerial_),
approxDiskBytes(approxDiskBytes_),
replay_operation_cost(replay_operation_cost_)
{}
- virtual SerialNum getFlushedSerialNum() const override {
+ SerialNum getFlushedSerialNum() const override {
return flushedSerial;
}
- virtual uint64_t getApproxBytesToWriteToDisk() const override {
+ uint64_t getApproxBytesToWriteToDisk() const override {
return approxDiskBytes;
}
double get_replay_operation_cost() const override {
diff --git a/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp b/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp
index 964cd47afa5..6c502bccce1 100644
--- a/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp
+++ b/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp
@@ -18,26 +18,26 @@ class MyLidSpace : public search::common::ICompactableLidSpace
bool _canShrink;
size_t _canFree;
public:
- MyLidSpace()
+ MyLidSpace() noexcept
: _canShrink(true),
_canFree(16)
{
}
- virtual ~MyLidSpace() override {}
+ ~MyLidSpace() override = default;
- virtual void compactLidSpace(uint32_t wantedDocLidLimit) override {
+ void compactLidSpace(uint32_t wantedDocLidLimit) override {
(void) wantedDocLidLimit;
}
- virtual bool canShrinkLidSpace() const override {
+ bool canShrinkLidSpace() const override {
return _canShrink;
}
- virtual size_t getEstimatedShrinkLidSpaceGain() const override {
+ size_t getEstimatedShrinkLidSpaceGain() const override {
return _canShrink ? _canFree : 0;
}
- virtual void shrinkLidSpace() override {
+ void shrinkLidSpace() override {
if (_canShrink) {
_canFree = 0;
_canShrink = false;
@@ -62,9 +62,11 @@ struct Fixture
{
}
- ~Fixture() { }
+ ~Fixture();
};
+Fixture::~Fixture() = default;
+
TEST_F("require that flush target returns estimated memory gain", Fixture)
{
auto memoryGain = f._ft->getApproxMemoryGain();
diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp
index 22dc19167f6..30f83273bd7 100644
--- a/searchcore/src/tests/proton/matching/matching_test.cpp
+++ b/searchcore/src/tests/proton/matching/matching_test.cpp
@@ -284,7 +284,7 @@ struct MyWorld {
struct MySearchHandler : ISearchHandler {
Matcher::SP _matcher;
- MySearchHandler(Matcher::SP matcher) : _matcher(matcher) {}
+ MySearchHandler(Matcher::SP matcher) noexcept : _matcher(std::move(matcher)) {}
DocsumReply::UP getDocsums(const DocsumRequest &) override {
return DocsumReply::UP();
diff --git a/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp b/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp
index 48b2a269f6b..bacdd85dcc5 100644
--- a/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp
+++ b/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp
@@ -61,7 +61,7 @@ struct MyDocumentDBReference : public MockDocumentDBReference {
std::shared_ptr<MockGidToLidChangeHandler> _gidToLidChangeHandler;
MyDocumentDBReference(MyGidToLidMapperFactory::SP factory_,
- std::shared_ptr<MockGidToLidChangeHandler> gidToLidChangeHandler)
+ std::shared_ptr<MockGidToLidChangeHandler> gidToLidChangeHandler) noexcept
: factory(std::move(factory_)),
_gidToLidChangeHandler(std::move(gidToLidChangeHandler))
{
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp
index 920472c6a01..a10d48ee7fe 100644
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp
+++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp
@@ -39,7 +39,7 @@ class ListenerStats {
uint32_t _destroyedListeners;
public:
- ListenerStats()
+ ListenerStats() noexcept
: _lock(),
_putChanges(0u),
_removeChanges(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 0053a03105f..242ad91271e 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
@@ -32,7 +32,7 @@ struct MyTask : public IReprocessingTask
double initProgress,
double middleProgress,
double finalProgress,
- double weight)
+ double weight) noexcept
: _runner(runner),
_initProgress(initProgress),
_middleProgress(middleProgress),
@@ -42,9 +42,7 @@ struct MyTask : public IReprocessingTask
{
}
- virtual void
- run() override
- {
+ void run() override {
ASSERT_EQUAL(_initProgress, _runner.getProgress());
_myProgress = 0.5;
ASSERT_EQUAL(_middleProgress, _runner.getProgress());
@@ -52,9 +50,7 @@ struct MyTask : public IReprocessingTask
ASSERT_EQUAL(_finalProgress, _runner.getProgress());
}
- virtual Progress
- getProgress() const override
- {
+ Progress getProgress() const override {
return Progress(_myProgress, _weight);
}
@@ -65,11 +61,7 @@ struct MyTask : public IReprocessingTask
double finalProgress,
double weight)
{
- return std::make_shared<MyTask>(runner,
- initProgress,
- middleProgress,
- finalProgress,
- weight);
+ return std::make_shared<MyTask>(runner, initProgress, middleProgress, finalProgress, weight);
}
};
@@ -77,16 +69,8 @@ TEST_F("require that progress is calculated when tasks are executed", Fixture)
{
TaskList tasks;
EXPECT_EQUAL(0.0, f._runner.getProgress());
- tasks.push_back(MyTask::create(f._runner,
- 0.0,
- 0.1,
- 0.2,
- 1.0));
- tasks.push_back(MyTask::create(f._runner,
- 0.2,
- 0.6,
- 1.0,
- 4.0));
+ tasks.push_back(MyTask::create(f._runner, 0.0, 0.1, 0.2, 1.0));
+ tasks.push_back(MyTask::create(f._runner, 0.2, 0.6, 1.0, 4.0));
f._runner.addTasks(tasks);
tasks.clear();
EXPECT_EQUAL(0.0, f._runner.getProgress());
@@ -99,11 +83,7 @@ TEST_F("require that runner can be reset", Fixture)
{
TaskList tasks;
EXPECT_EQUAL(0.0, f._runner.getProgress());
- tasks.push_back(MyTask::create(f._runner,
- 0.0,
- 0.5,
- 1.0,
- 1.0));
+ tasks.push_back(MyTask::create(f._runner, 0.0, 0.5, 1.0, 1.0));
f._runner.addTasks(tasks);
tasks.clear();
EXPECT_EQUAL(0.0, f._runner.getProgress());
@@ -111,21 +91,13 @@ TEST_F("require that runner can be reset", Fixture)
EXPECT_EQUAL(1.0, f._runner.getProgress());
f._runner.reset();
EXPECT_EQUAL(0.0, f._runner.getProgress());
- tasks.push_back(MyTask::create(f._runner,
- 0.0,
- 0.5,
- 1.0,
- 1.0));
+ tasks.push_back(MyTask::create(f._runner, 0.0, 0.5, 1.0, 1.0));
f._runner.addTasks(tasks);
tasks.clear();
EXPECT_EQUAL(0.0, f._runner.getProgress());
f._runner.reset();
EXPECT_EQUAL(0.0, f._runner.getProgress());
- tasks.push_back(MyTask::create(f._runner,
- 0.0,
- 0.5,
- 1.0,
- 4.0));
+ tasks.push_back(MyTask::create(f._runner, 0.0, 0.5, 1.0, 4.0));
f._runner.addTasks(tasks);
tasks.clear();
EXPECT_EQUAL(0.0, f._runner.getProgress());
diff --git a/searchcore/src/tests/proton/server/feedstates_test.cpp b/searchcore/src/tests/proton/server/feedstates_test.cpp
index 42d88328d14..59e504de6ce 100644
--- a/searchcore/src/tests/proton/server/feedstates_test.cpp
+++ b/searchcore/src/tests/proton/server/feedstates_test.cpp
@@ -124,7 +124,7 @@ TEST_F("require that replay progress is tracked", Fixture)
{
RemoveOperationContext opCtx(10);
TlsReplayProgress progress("test", 5, 15);
- PacketWrapper::SP wrap(new PacketWrapper(*opCtx.packet, &progress));
+ auto wrap = std::make_shared<PacketWrapper>(*opCtx.packet, &progress);
ForegroundThreadExecutor executor;
f.state.receive(wrap, executor);
diff --git a/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp b/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp
index 7f650847183..305f5d8c9ba 100644
--- a/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp
+++ b/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp
@@ -22,19 +22,13 @@ typedef IFlushTarget::DiskGain DiskGain;
class MyFlushHandler : public IFlushHandler {
public:
- MyFlushHandler(const vespalib::string &name) : IFlushHandler(name) {}
- // Implements IFlushHandler
- virtual std::vector<IFlushTarget::SP> getFlushTargets() override {
+ MyFlushHandler(const vespalib::string &name) noexcept : IFlushHandler(name) {}
+ std::vector<IFlushTarget::SP> getFlushTargets() override {
return std::vector<IFlushTarget::SP>();
}
- virtual SerialNum getCurrentSerialNumber() const override { return 0; }
- virtual void flushDone(SerialNum oldestSerial) override { (void) oldestSerial; }
-
- virtual void
- syncTls(search::SerialNum syncTo) override
- {
- (void) syncTo;
- }
+ SerialNum getCurrentSerialNumber() const override { return 0; }
+ void flushDone(SerialNum oldestSerial) override { (void) oldestSerial; }
+ void syncTls(search::SerialNum syncTo) override {(void) syncTo;}
};
class MyFlushTarget : public test::DummyFlushTarget {
@@ -47,7 +41,7 @@ private:
public:
MyFlushTarget(const vespalib::string &name, MemoryGain memoryGain,
DiskGain diskGain, SerialNum flushedSerial,
- system_time lastFlushTime, bool urgentFlush) :
+ system_time lastFlushTime, bool urgentFlush) noexcept :
test::DummyFlushTarget(name),
_memoryGain(memoryGain),
_diskGain(diskGain),
@@ -56,12 +50,11 @@ public:
_urgentFlush(urgentFlush)
{
}
- // Implements IFlushTarget
- virtual MemoryGain getApproxMemoryGain() const override { return _memoryGain; }
- virtual DiskGain getApproxDiskGain() const override { return _diskGain; }
- virtual SerialNum getFlushedSerialNum() const override { return _flushedSerial; }
- virtual system_time getLastFlushTime() const override { return _lastFlushTime; }
- virtual bool needUrgentFlush() const override { return _urgentFlush; }
+ MemoryGain getApproxMemoryGain() const override { return _memoryGain; }
+ DiskGain getApproxDiskGain() const override { return _diskGain; }
+ SerialNum getFlushedSerialNum() const override { return _flushedSerial; }
+ system_time getLastFlushTime() const override { return _lastFlushTime; }
+ bool needUrgentFlush() const override { return _urgentFlush; }
};
struct StringList : public std::vector<vespalib::string> {