diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-09 00:21:14 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-09 00:21:14 +0100 |
commit | 94eea5f229b0a4034676002a423b226185a10820 (patch) | |
tree | fddc26a218c233f7b3b509525370d0f6d7ef17c8 /messagebus/src/tests | |
parent | 68c336f802bba1974186c085ee7725a12980e244 (diff) |
deiniline destructors
Diffstat (limited to 'messagebus/src/tests')
-rw-r--r-- | messagebus/src/tests/advancedrouting/advancedrouting.cpp | 2 | ||||
-rw-r--r-- | messagebus/src/tests/choke/choke.cpp | 3 | ||||
-rw-r--r-- | messagebus/src/tests/messageordering/messageordering.cpp | 87 | ||||
-rw-r--r-- | messagebus/src/tests/resender/resender.cpp | 7 | ||||
-rw-r--r-- | messagebus/src/tests/routing/routing.cpp | 3 | ||||
-rw-r--r-- | messagebus/src/tests/routingcontext/routingcontext.cpp | 3 | ||||
-rw-r--r-- | messagebus/src/tests/sendadapter/sendadapter.cpp | 7 |
7 files changed, 67 insertions, 45 deletions
diff --git a/messagebus/src/tests/advancedrouting/advancedrouting.cpp b/messagebus/src/tests/advancedrouting/advancedrouting.cpp index 384c9be667f..26e62ca7956 100644 --- a/messagebus/src/tests/advancedrouting/advancedrouting.cpp +++ b/messagebus/src/tests/advancedrouting/advancedrouting.cpp @@ -32,6 +32,7 @@ public: public: TestData(); + ~TestData(); bool start(); }; @@ -47,6 +48,7 @@ public: TEST_APPHOOK(Test); +TestData::~TestData() {} TestData::TestData() : _slobrok(), _retryPolicy(new RetryTransientErrorsPolicy()), diff --git a/messagebus/src/tests/choke/choke.cpp b/messagebus/src/tests/choke/choke.cpp index 023554250cc..4c223f6a55a 100644 --- a/messagebus/src/tests/choke/choke.cpp +++ b/messagebus/src/tests/choke/choke.cpp @@ -30,6 +30,7 @@ public: public: TestData(); + ~TestData(); bool start(); }; @@ -65,6 +66,8 @@ TestData::TestData() : // empty } +TestData::~TestData() {} + bool TestData::start() { diff --git a/messagebus/src/tests/messageordering/messageordering.cpp b/messagebus/src/tests/messageordering/messageordering.cpp index a502769a9e8..0c102915cb1 100644 --- a/messagebus/src/tests/messageordering/messageordering.cpp +++ b/messagebus/src/tests/messageordering/messageordering.cpp @@ -88,51 +88,60 @@ class VerifyReplyReceptor : public IReplyHandler std::string _failure; int _replyCount; public: - VerifyReplyReceptor() - : _mon(), - _failure(), - _replyCount(0) - {} - void handleReply(Reply::UP reply) - { - vespalib::MonitorGuard lock(_mon); - if (reply->hasErrors()) { - std::ostringstream ss; - ss << "Reply failed with " - << reply->getError(0).getMessage() - << "\n" - << reply->getTrace().toString(); + ~VerifyReplyReceptor(); + VerifyReplyReceptor(); + void handleReply(Reply::UP reply); + void waitUntilDone(int waitForCount) const; + const std::string& getFailure() const { return _failure; } +}; + +VerifyReplyReceptor::~VerifyReplyReceptor() {} +VerifyReplyReceptor::VerifyReplyReceptor() + : _mon(), + _failure(), + _replyCount(0) +{} + +void +VerifyReplyReceptor::handleReply(Reply::UP reply) +{ + vespalib::MonitorGuard lock(_mon); + if (reply->hasErrors()) { + std::ostringstream ss; + ss << "Reply failed with " + << reply->getError(0).getMessage() + << "\n" + << reply->getTrace().toString(); + if (_failure.empty()) { + _failure = ss.str(); + } + LOG(warning, "%s", ss.str().c_str()); + } else { + vespalib::string expected(vespalib::make_vespa_string("%d", _replyCount)); + SimpleReply& simpleReply(static_cast<SimpleReply&>(*reply)); + if (simpleReply.getValue() != expected) { + std::stringstream ss; + ss << "Received out-of-sequence reply! Expected " + << expected + << ", but got " + << simpleReply.getValue(); + LOG(warning, "%s", ss.str().c_str()); if (_failure.empty()) { _failure = ss.str(); } - LOG(warning, "%s", ss.str().c_str()); - } else { - vespalib::string expected(vespalib::make_vespa_string("%d", _replyCount)); - SimpleReply& simpleReply(static_cast<SimpleReply&>(*reply)); - if (simpleReply.getValue() != expected) { - std::stringstream ss; - ss << "Received out-of-sequence reply! Expected " - << expected - << ", but got " - << simpleReply.getValue(); - LOG(warning, "%s", ss.str().c_str()); - if (_failure.empty()) { - _failure = ss.str(); - } - } } - ++_replyCount; - lock.broadcast(); } - void waitUntilDone(int waitForCount) const - { - vespalib::MonitorGuard lock(_mon); - while (_replyCount < waitForCount) { - lock.wait(1000); - } + ++_replyCount; + lock.broadcast(); +} +void +VerifyReplyReceptor::waitUntilDone(int waitForCount) const +{ + vespalib::MonitorGuard lock(_mon); + while (_replyCount < waitForCount) { + lock.wait(1000); } - const std::string& getFailure() const { return _failure; } -}; +} int Test::Main() diff --git a/messagebus/src/tests/resender/resender.cpp b/messagebus/src/tests/resender/resender.cpp index a067616d1ba..c559f244a62 100644 --- a/messagebus/src/tests/resender/resender.cpp +++ b/messagebus/src/tests/resender/resender.cpp @@ -55,6 +55,7 @@ public: Receptor _dstHandler; public: + ~TestData(); TestData(); bool start(); }; @@ -88,9 +89,9 @@ TestData::TestData() : RPCNetworkParams().setIdentity(Identity("dst")).setSlobrokConfig(_slobrok.config())), _dstSession(), _dstHandler() -{ - // empty -} +{ } + +TestData::~TestData() {} bool TestData::start() diff --git a/messagebus/src/tests/routing/routing.cpp b/messagebus/src/tests/routing/routing.cpp index 23698279137..be0a69e855a 100644 --- a/messagebus/src/tests/routing/routing.cpp +++ b/messagebus/src/tests/routing/routing.cpp @@ -476,6 +476,7 @@ public: public: TestData(); + ~TestData(); bool start(); }; @@ -570,6 +571,8 @@ TestData::TestData() : _retryPolicy->setBaseDelay(0); } +TestData::~TestData() {} + bool TestData::start() { diff --git a/messagebus/src/tests/routingcontext/routingcontext.cpp b/messagebus/src/tests/routingcontext/routingcontext.cpp index 02c7ef6dd72..d8d76a3069c 100644 --- a/messagebus/src/tests/routingcontext/routingcontext.cpp +++ b/messagebus/src/tests/routingcontext/routingcontext.cpp @@ -202,6 +202,7 @@ public: public: TestData(); + ~TestData(); bool start(); }; @@ -234,6 +235,8 @@ TestData::TestData() : _retryPolicy->setBaseDelay(0); } +TestData::~TestData() {} + bool TestData::start() { diff --git a/messagebus/src/tests/sendadapter/sendadapter.cpp b/messagebus/src/tests/sendadapter/sendadapter.cpp index b25240acdac..f4973b96e31 100644 --- a/messagebus/src/tests/sendadapter/sendadapter.cpp +++ b/messagebus/src/tests/sendadapter/sendadapter.cpp @@ -55,6 +55,7 @@ public: public: TestData(); + ~TestData(); bool start(); }; @@ -91,9 +92,9 @@ TestData::TestData() : RPCNetworkParams().setIdentity(Identity("dst")).setSlobrokConfig(_slobrok.config())), _dstSession(), _dstHandler() -{ - // empty -} +{ } + +TestData::~TestData() {} bool TestData::start() |