summaryrefslogtreecommitdiffstats
path: root/messagebus/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'messagebus/src/tests')
-rw-r--r--messagebus/src/tests/advancedrouting/advancedrouting.cpp22
-rw-r--r--messagebus/src/tests/choke/choke.cpp30
-rw-r--r--messagebus/src/tests/context/context.cpp18
-rw-r--r--messagebus/src/tests/messagebus/messagebus.cpp68
-rw-r--r--messagebus/src/tests/resender/resender.cpp68
-rw-r--r--messagebus/src/tests/routable/routable.cpp4
-rw-r--r--messagebus/src/tests/routablequeue/routablequeue.cpp20
-rw-r--r--messagebus/src/tests/routing/routing.cpp133
-rw-r--r--messagebus/src/tests/routingcontext/routingcontext.cpp2
-rw-r--r--messagebus/src/tests/sendadapter/sendadapter.cpp10
-rw-r--r--messagebus/src/tests/sequencer/sequencer.cpp8
-rw-r--r--messagebus/src/tests/shutdown/shutdown.cpp6
-rw-r--r--messagebus/src/tests/sourcesession/sourcesession.cpp28
-rw-r--r--messagebus/src/tests/throttling/throttling.cpp26
-rw-r--r--messagebus/src/tests/timeout/timeout.cpp2
15 files changed, 218 insertions, 227 deletions
diff --git a/messagebus/src/tests/advancedrouting/advancedrouting.cpp b/messagebus/src/tests/advancedrouting/advancedrouting.cpp
index b18653d272d..f1557b8a305 100644
--- a/messagebus/src/tests/advancedrouting/advancedrouting.cpp
+++ b/messagebus/src/tests/advancedrouting/advancedrouting.cpp
@@ -115,7 +115,7 @@ Test::Main()
void
Test::testAdvanced(TestData &data)
{
- const double TIMEOUT = 60;
+ const duration TIMEOUT = 60s;
IProtocol::SP protocol(new SimpleProtocol());
SimpleProtocol &simple = static_cast<SimpleProtocol&>(*protocol);
simple.addPolicyFactory("Custom", SimpleProtocol::IPolicyFactory::SP(new CustomPolicyFactory(false, ErrorCode::NO_ADDRESS_FOR_SERVICE)));
@@ -130,41 +130,41 @@ Test::testAdvanced(TestData &data)
// Initial send.
Message::UP msg = data._fooHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._fooSession->acknowledge(std::move(msg));
msg = data._barHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::TRANSIENT_ERROR, "bar"));
data._barSession->reply(std::move(reply));
msg = data._bazHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
reply.reset(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::TRANSIENT_ERROR, "baz1"));
data._bazSession->reply(std::move(reply));
// First retry.
- msg = data._fooHandler.getMessage(0);
+ msg = data._fooHandler.getMessage(duration::zero());
ASSERT_TRUE(msg.get() == NULL);
msg = data._barHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._barSession->acknowledge(std::move(msg));
msg = data._bazHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
reply.reset(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::TRANSIENT_ERROR, "baz2"));
data._bazSession->reply(std::move(reply));
// Second retry.
- msg = data._fooHandler.getMessage(0);
+ msg = data._fooHandler.getMessage(duration::zero());
ASSERT_TRUE(msg.get() == NULL);
- msg = data._barHandler.getMessage(0);
+ msg = data._barHandler.getMessage(duration::zero());
ASSERT_TRUE(msg.get() == NULL);
msg = data._bazHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
reply.reset(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::FATAL_ERROR, "baz3"));
@@ -172,7 +172,7 @@ Test::testAdvanced(TestData &data)
// Done.
reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
printf("%s", reply->getTrace().toString().c_str());
EXPECT_EQUAL(2u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::FATAL_ERROR, reply->getError(0).getCode());
diff --git a/messagebus/src/tests/choke/choke.cpp b/messagebus/src/tests/choke/choke.cpp
index 105da2b3bd1..e10d87ed2ba 100644
--- a/messagebus/src/tests/choke/choke.cpp
+++ b/messagebus/src/tests/choke/choke.cpp
@@ -71,13 +71,13 @@ TestData::start()
_srcSession = _srcServer.mb.createSourceSession(SourceSessionParams()
.setThrottlePolicy(IThrottlePolicy::SP())
.setReplyHandler(_srcHandler));
- if (_srcSession.get() == NULL) {
+ if ( ! _srcSession) {
return false;
}
_dstSession = _dstServer.mb.createDestinationSession(DestinationSessionParams()
.setName("session")
.setMessageHandler(_dstHandler));
- if (_dstSession.get() == NULL) {
+ if ( ! _dstSession) {
return false;
}
if (!_srcServer.waitSlobrok("dst/session", 1u)) {
@@ -108,7 +108,7 @@ Test::Main()
TEST_DONE();
}
-static const double TIMEOUT = 120;
+static const duration TIMEOUT = 120s;
////////////////////////////////////////////////////////////////////////////////
//
@@ -131,11 +131,11 @@ Test::testMaxCount(TestData &data)
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
if (i < max) {
Message::UP msg = data._dstHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
lst.push_back(msg.release());
} else {
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::SESSION_BUSY, reply->getError(0).getCode());
}
@@ -146,14 +146,14 @@ Test::testMaxCount(TestData &data)
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
msg = reply->getMessage();
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
EXPECT_TRUE(data._srcSession->send(std::move(msg), Route::parse("dst/session")).isAccepted());
msg = data._dstHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
lst.push_back(msg.release());
}
while (!lst.empty()) {
@@ -163,7 +163,7 @@ Test::testMaxCount(TestData &data)
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
}
EXPECT_EQUAL(0u, data._dstServer.mb.getPendingCount());
@@ -185,11 +185,11 @@ Test::testMaxSize(TestData &data)
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
if (i < max) {
Message::UP msg = data._dstHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
lst.push_back(msg.release());
} else {
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::SESSION_BUSY, reply->getError(0).getCode());
}
@@ -200,14 +200,14 @@ Test::testMaxSize(TestData &data)
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
msg = reply->getMessage();
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
EXPECT_TRUE(data._srcSession->send(std::move(msg), Route::parse("dst/session")).isAccepted());
msg = data._dstHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
lst.push_back(msg.release());
}
while (!lst.empty()) {
@@ -217,7 +217,7 @@ Test::testMaxSize(TestData &data)
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
}
EXPECT_EQUAL(0u, data._dstServer.mb.getPendingSize());
diff --git a/messagebus/src/tests/context/context.cpp b/messagebus/src/tests/context/context.cpp
index de9dd1b83a6..39a7ca7b467 100644
--- a/messagebus/src/tests/context/context.cpp
+++ b/messagebus/src/tests/context/context.cpp
@@ -1,17 +1,13 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/messagebus/destinationsession.h>
-#include <vespa/messagebus/intermediatesession.h>
#include <vespa/messagebus/messagebus.h>
#include <vespa/messagebus/routablequeue.h>
#include <vespa/messagebus/routing/routingspec.h>
#include <vespa/messagebus/sourcesession.h>
#include <vespa/messagebus/sourcesessionparams.h>
-#include <vespa/messagebus/testlib/receptor.h>
#include <vespa/messagebus/testlib/slobrok.h>
#include <vespa/messagebus/testlib/simplemessage.h>
-#include <vespa/messagebus/testlib/simplereply.h>
-#include <vespa/messagebus/testlib/simpleprotocol.h>
#include <vespa/messagebus/testlib/testserver.h>
#include <vespa/vespalib/testkit/testapp.h>
@@ -24,7 +20,7 @@ struct Handler : public IMessageHandler
Handler(MessageBus &mb) : session() {
session = mb.createDestinationSession("session", true, *this);
}
- ~Handler() {
+ ~Handler() override {
session.reset();
}
void handleMessage(Message::UP msg) override {
@@ -81,18 +77,18 @@ Test::Main()
}
EXPECT_EQUAL(queue.size(), 3u);
{
- Reply::UP reply = Reply::UP((Reply*)queue.dequeue(0).release());
- ASSERT_TRUE(reply.get() != 0);
+ Reply::UP reply = Reply::UP((Reply*)queue.dequeue(duration::zero()).release());
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(reply->getContext().value.UINT64, 10u);
}
{
- Reply::UP reply = Reply::UP((Reply*)queue.dequeue(0).release());
- ASSERT_TRUE(reply.get() != 0);
+ Reply::UP reply = Reply::UP((Reply*)queue.dequeue(duration::zero()).release());
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(reply->getContext().value.UINT64, 20u);
}
{
- Reply::UP reply = Reply::UP((Reply*)queue.dequeue(0).release());
- ASSERT_TRUE(reply.get() != 0);
+ Reply::UP reply = Reply::UP((Reply*)queue.dequeue(duration::zero()).release());
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(reply->getContext().value.UINT64, 30u);
}
TEST_DONE();
diff --git a/messagebus/src/tests/messagebus/messagebus.cpp b/messagebus/src/tests/messagebus/messagebus.cpp
index 7434941a900..cf249e6eaec 100644
--- a/messagebus/src/tests/messagebus/messagebus.cpp
+++ b/messagebus/src/tests/messagebus/messagebus.cpp
@@ -21,7 +21,7 @@ struct Base {
Base() : queue() {}
virtual ~Base() {
while (queue.size() > 0) {
- Routable::UP r = queue.dequeue(0);
+ Routable::UP r = queue.dequeue();
r->getCallStack().discard();
}
}
@@ -219,8 +219,8 @@ Test::testSendToAny()
for (uint32_t i = 0; i < dpVec.size(); ++i) {
DocProc *p = dpVec[i];
while (p->queue.size() > 0) {
- Routable::UP msg = p->queue.dequeue(0);
- ASSERT_TRUE(msg.get() != 0);
+ Routable::UP msg = p->queue.dequeue();
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
msg->swapState(*reply);
reply->addError(Error(ErrorCode::FATAL_ERROR, ""));
@@ -229,8 +229,8 @@ Test::testSendToAny()
}
EXPECT_TRUE(client->waitQueueSize(300));
while (client->queue.size() > 0) {
- Routable::UP reply = client->queue.dequeue(0);
- ASSERT_TRUE(reply.get() != 0);
+ Routable::UP reply = client->queue.dequeue();
+ ASSERT_TRUE(reply);
ASSERT_TRUE(reply->isReply());
EXPECT_TRUE(static_cast<Reply&>(*reply).getNumErrors() == 1);
}
@@ -262,8 +262,8 @@ Test::testSendToCol()
for (uint32_t i = 0; i < searchVec.size(); ++i) {
Search *s = searchVec[i];
while (s->queue.size() > 0) {
- Routable::UP msg = s->queue.dequeue(0);
- ASSERT_TRUE(msg.get() != 0);
+ Routable::UP msg = s->queue.dequeue();
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
msg->swapState(*reply);
s->session->reply(std::move(reply));
@@ -273,8 +273,8 @@ Test::testSendToCol()
FastOS_Thread::Sleep(100);
client->waitQueueSize(300);
while (client->queue.size() > 0) {
- Routable::UP reply = client->queue.dequeue(0);
- ASSERT_TRUE(reply.get() != 0);
+ Routable::UP reply = client->queue.dequeue();
+ ASSERT_TRUE(reply);
ASSERT_TRUE(reply->isReply());
EXPECT_TRUE(static_cast<Reply&>(*reply).getNumErrors() == 0);
}
@@ -296,8 +296,8 @@ Test::testSendToAnyThenCol()
for (uint32_t i = 0; i < dpVec.size(); ++i) {
DocProc *p = dpVec[i];
while (p->queue.size() > 0) {
- Routable::UP r = p->queue.dequeue(0);
- ASSERT_TRUE(r.get() != 0);
+ Routable::UP r = p->queue.dequeue();
+ ASSERT_TRUE(r);
p->session->forward(std::move(r));
}
}
@@ -316,8 +316,8 @@ Test::testSendToAnyThenCol()
for (uint32_t i = 0; i < dpVec.size(); ++i) {
DocProc *p = dpVec[i];
while (p->queue.size() > 0) {
- Routable::UP r = p->queue.dequeue(0);
- ASSERT_TRUE(r.get() != 0);
+ Routable::UP r = p->queue.dequeue();
+ ASSERT_TRUE(r);
p->session->forward(std::move(r));
}
}
@@ -328,8 +328,8 @@ Test::testSendToAnyThenCol()
for (uint32_t i = 0; i < searchVec.size(); ++i) {
Search *s = searchVec[i];
while (s->queue.size() > 0) {
- Routable::UP msg = s->queue.dequeue(0);
- ASSERT_TRUE(msg.get() != 0);
+ Routable::UP msg = s->queue.dequeue();
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
msg->swapState(*reply);
s->session->reply(std::move(reply));
@@ -341,8 +341,8 @@ Test::testSendToAnyThenCol()
for (uint32_t i = 0; i < dpVec.size(); ++i) {
DocProc *p = dpVec[i];
while (p->queue.size() > 0) {
- Routable::UP r = p->queue.dequeue(0);
- ASSERT_TRUE(r.get() != 0);
+ Routable::UP r = p->queue.dequeue();
+ ASSERT_TRUE(r);
p->session->forward(std::move(r));
}
}
@@ -350,8 +350,8 @@ Test::testSendToAnyThenCol()
FastOS_Thread::Sleep(100);
client->waitQueueSize(300);
while (client->queue.size() > 0) {
- Routable::UP reply = client->queue.dequeue(0);
- ASSERT_TRUE(reply.get() != 0);
+ Routable::UP reply = client->queue.dequeue();
+ ASSERT_TRUE(reply);
ASSERT_TRUE(reply->isReply());
EXPECT_TRUE(static_cast<Reply&>(*reply).getNumErrors() == 0);
}
@@ -423,8 +423,8 @@ void
Test::assertDst(Search& dst)
{
ASSERT_TRUE(dst.waitQueueSize(1));
- Routable::UP msg = dst.queue.dequeue(0);
- ASSERT_TRUE(msg.get() != 0);
+ Routable::UP msg = dst.queue.dequeue();
+ ASSERT_TRUE(msg);
dst.session->acknowledge(Message::UP(static_cast<Message*>(msg.release())));
}
@@ -432,8 +432,8 @@ void
Test::assertItr(DocProc& itr)
{
ASSERT_TRUE(itr.waitQueueSize(1));
- Routable::UP msg = itr.queue.dequeue(0);
- ASSERT_TRUE(msg.get() != 0);
+ Routable::UP msg = itr.queue.dequeue();
+ ASSERT_TRUE(msg);
itr.session->forward(std::move(msg));
}
@@ -441,8 +441,8 @@ void
Test::assertSrc(Client& src)
{
ASSERT_TRUE(src.waitQueueSize(1));
- Routable::UP msg = src.queue.dequeue(0);
- ASSERT_TRUE(msg.get() != 0);
+ Routable::UP msg = src.queue.dequeue();
+ ASSERT_TRUE(msg);
}
void
@@ -485,8 +485,8 @@ Test::debugTrace()
for (uint32_t i = 0; i < dpVec.size(); ++i) {
DocProc *p = dpVec[i];
while (p->queue.size() > 0) {
- Routable::UP r = p->queue.dequeue(0);
- ASSERT_TRUE(r.get() != 0);
+ Routable::UP r = p->queue.dequeue();
+ ASSERT_TRUE(r);
p->session->forward(std::move(r));
}
}
@@ -497,8 +497,8 @@ Test::debugTrace()
for (uint32_t i = 0; i < searchVec.size(); ++i) {
Search *s = searchVec[i];
while (s->queue.size() > 0) {
- Routable::UP msg = s->queue.dequeue(0);
- ASSERT_TRUE(msg.get() != 0);
+ Routable::UP msg = s->queue.dequeue();
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
msg->swapState(*reply);
s->session->reply(std::move(reply));
@@ -510,21 +510,21 @@ Test::debugTrace()
for (uint32_t i = 0; i < dpVec.size(); ++i) {
DocProc *p = dpVec[i];
while (p->queue.size() > 0) {
- Routable::UP r = p->queue.dequeue(0);
- ASSERT_TRUE(r.get() != 0);
+ Routable::UP r = p->queue.dequeue();
+ ASSERT_TRUE(r);
p->session->forward(std::move(r));
}
}
client->waitQueueSize(3);
- Routable::UP reply = client->queue.dequeue(0);
+ Routable::UP reply = client->queue.dequeue();
fprintf(stderr, "\nTRACE DUMP(level=%d):\n%s\n\n",
reply->getTrace().getLevel(),
reply->getTrace().toString().c_str());
- reply = client->queue.dequeue(0);
+ reply = client->queue.dequeue();
fprintf(stderr, "\nTRACE DUMP(level=%d):\n%s\n\n",
reply->getTrace().getLevel(),
reply->getTrace().toString().c_str());
- reply = client->queue.dequeue(0);
+ reply = client->queue.dequeue();
fprintf(stderr, "\nTRACE DUMP(level=%d):\n%s\n\n",
reply->getTrace().getLevel(),
reply->getTrace().toString().c_str());
diff --git a/messagebus/src/tests/resender/resender.cpp b/messagebus/src/tests/resender/resender.cpp
index cd7fdbeb6cc..f40dbdc5e4a 100644
--- a/messagebus/src/tests/resender/resender.cpp
+++ b/messagebus/src/tests/resender/resender.cpp
@@ -3,9 +3,7 @@
#include <vespa/messagebus/emptyreply.h>
#include <vespa/messagebus/errorcode.h>
#include <vespa/messagebus/messagebus.h>
-#include <vespa/messagebus/routing/errordirective.h>
#include <vespa/messagebus/routing/retrytransienterrorspolicy.h>
-#include <vespa/messagebus/testlib/custompolicy.h>
#include <vespa/messagebus/testlib/receptor.h>
#include <vespa/messagebus/testlib/simplemessage.h>
#include <vespa/messagebus/testlib/simpleprotocol.h>
@@ -32,7 +30,7 @@ StringList::add(const string &str)
std::vector<string>::push_back(str); return *this;
}
-static const double GET_MESSAGE_TIMEOUT = 60.0;
+static const duration GET_MESSAGE_TIMEOUT = 60s;
////////////////////////////////////////////////////////////////////////////////
//
@@ -158,20 +156,20 @@ Test::testRetryTag(TestData &data)
data._retryPolicy->setEnabled(true);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
for (uint32_t i = 0; i < 5; ++i) {
EXPECT_EQUAL(i, msg->getRetry());
EXPECT_EQUAL(true, msg->getRetryEnabled());
replyFromDestination(data, std::move(msg), ErrorCode::APP_TRANSIENT_ERROR, 0);
msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
}
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
- msg = data._dstHandler.getMessage(0);
- EXPECT_TRUE(msg.get() == NULL);
+ msg = data._dstHandler.getMessageNow();
+ EXPECT_FALSE(msg);
printf("%s", reply->getTrace().toString().c_str());
}
@@ -183,14 +181,14 @@ Test::testRetryEnabledTag(TestData &data)
msg->setRetryEnabled(false);
EXPECT_TRUE(data._srcSession->send(std::move(msg), Route::parse("dst/session")).isAccepted());
msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
EXPECT_EQUAL(false, msg->getRetryEnabled());
replyFromDestination(data, std::move(msg), ErrorCode::APP_TRANSIENT_ERROR, 0);
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(reply->hasErrors());
- msg = data._dstHandler.getMessage(0);
- EXPECT_TRUE(msg.get() == NULL);
+ msg = data._dstHandler.getMessageNow();
+ EXPECT_FALSE(msg);
printf("%s", reply->getTrace().toString().c_str());
}
@@ -200,16 +198,16 @@ Test::testTransientError(TestData &data)
data._retryPolicy->setEnabled(true);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
replyFromDestination(data, std::move(msg), ErrorCode::APP_TRANSIENT_ERROR, 0);
msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
replyFromDestination(data, std::move(msg), ErrorCode::APP_FATAL_ERROR, 0);
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(reply->hasFatalErrors());
- msg = data._dstHandler.getMessage(0);
- EXPECT_TRUE(msg.get() == NULL);
+ msg = data._dstHandler.getMessageNow();
+ EXPECT_FALSE(msg);
printf("%s", reply->getTrace().toString().c_str());
}
@@ -219,13 +217,13 @@ Test::testFatalError(TestData &data)
data._retryPolicy->setEnabled(true);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
replyFromDestination(data, std::move(msg), ErrorCode::APP_FATAL_ERROR, 0);
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(reply->hasFatalErrors());
- msg = data._dstHandler.getMessage(0);
- EXPECT_TRUE(msg.get() == NULL);
+ msg = data._dstHandler.getMessageNow();
+ EXPECT_FALSE(msg);
printf("%s", reply->getTrace().toString().c_str());
}
@@ -235,14 +233,14 @@ Test::testDisableRetry(TestData &data)
data._retryPolicy->setEnabled(false);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
replyFromDestination(data, std::move(msg), ErrorCode::APP_TRANSIENT_ERROR, 0);
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(reply->hasErrors());
EXPECT_TRUE(!reply->hasFatalErrors());
- msg = data._dstHandler.getMessage(0);
- EXPECT_TRUE(msg.get() == NULL);
+ msg = data._dstHandler.getMessageNow();
+ EXPECT_FALSE(msg);
printf("%s", reply->getTrace().toString().c_str());
}
@@ -253,19 +251,19 @@ Test::testRetryDelay(TestData &data)
data._retryPolicy->setBaseDelay(0.01);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
for (uint32_t i = 0; i < 5; ++i) {
EXPECT_EQUAL(i, msg->getRetry());
replyFromDestination(data, std::move(msg), ErrorCode::APP_TRANSIENT_ERROR, -1);
msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
}
replyFromDestination(data, std::move(msg), ErrorCode::APP_FATAL_ERROR, 0);
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(reply->hasFatalErrors());
- msg = data._dstHandler.getMessage(0);
- EXPECT_TRUE(msg.get() == NULL);
+ msg = data._dstHandler.getMessageNow();
+ EXPECT_FALSE(msg);
string trace = reply->getTrace().toString();
EXPECT_TRUE(trace.find("retry 1 in 0.000") != string::npos);
@@ -282,19 +280,19 @@ Test::testRequestRetryDelay(TestData &data)
data._retryPolicy->setBaseDelay(1);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
for (uint32_t i = 0; i < 5; ++i) {
EXPECT_EQUAL(i, msg->getRetry());
replyFromDestination(data, std::move(msg), ErrorCode::APP_TRANSIENT_ERROR, i / 50.0);
msg = data._dstHandler.getMessage(GET_MESSAGE_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
}
replyFromDestination(data, std::move(msg), ErrorCode::APP_FATAL_ERROR, 0);
Reply::UP reply = data._srcHandler.getReply();
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(reply->hasFatalErrors());
- msg = data._dstHandler.getMessage(0);
- EXPECT_TRUE(msg.get() == NULL);
+ msg = data._dstHandler.getMessageNow();
+ EXPECT_FALSE(msg);
string trace = reply->getTrace().toString();
EXPECT_TRUE(trace.find("retry 1 in 0.000") != string::npos);
diff --git a/messagebus/src/tests/routable/routable.cpp b/messagebus/src/tests/routable/routable.cpp
index a7a35508656..88db25fa9c7 100644
--- a/messagebus/src/tests/routable/routable.cpp
+++ b/messagebus/src/tests/routable/routable.cpp
@@ -73,7 +73,7 @@ Test::Main()
msg.pushHandler(handler);
msg.discard();
- Reply::UP reply = handler.getReply(0);
+ Reply::UP reply = handler.getReply(duration::zero());
ASSERT_FALSE(reply);
}
{
@@ -86,7 +86,7 @@ Test::Main()
reply.swapState(msg);
reply.discard();
- Reply::UP ap = handler.getReply(0);
+ Reply::UP ap = handler.getReply(duration::zero());
ASSERT_FALSE(ap);
}
diff --git a/messagebus/src/tests/routablequeue/routablequeue.cpp b/messagebus/src/tests/routablequeue/routablequeue.cpp
index 4e7c918134f..04e90984f88 100644
--- a/messagebus/src/tests/routablequeue/routablequeue.cpp
+++ b/messagebus/src/tests/routablequeue/routablequeue.cpp
@@ -40,8 +40,8 @@ Test::Main()
{
RoutableQueue rq;
EXPECT_TRUE(rq.size() == 0);
- EXPECT_TRUE(rq.dequeue(0).get() == 0);
- EXPECT_TRUE(rq.dequeue(100).get() == 0);
+ EXPECT_TRUE(rq.dequeue().get() == 0);
+ EXPECT_TRUE(rq.dequeue(100ms).get() == 0);
EXPECT_TRUE(TestMessage::getCnt() == 0);
EXPECT_TRUE(TestReply::getCnt() == 0);
rq.enqueue(Routable::UP(new TestMessage(101)));
@@ -61,16 +61,16 @@ Test::Main()
EXPECT_TRUE(TestMessage::getCnt() == 2);
EXPECT_TRUE(TestReply::getCnt() == 2);
{
- Routable::UP r = rq.dequeue(0);
- ASSERT_TRUE(r.get() != 0);
+ Routable::UP r = rq.dequeue();
+ ASSERT_TRUE(r);
EXPECT_TRUE(rq.size() == 3);
EXPECT_TRUE(r->getType() == 101);
}
EXPECT_TRUE(TestMessage::getCnt() == 1);
EXPECT_TRUE(TestReply::getCnt() == 2);
{
- Routable::UP r = rq.dequeue(0);
- ASSERT_TRUE(r.get() != 0);
+ Routable::UP r = rq.dequeue();
+ ASSERT_TRUE(r);
EXPECT_TRUE(rq.size() == 2);
EXPECT_TRUE(r->getType() == 201);
}
@@ -85,16 +85,16 @@ Test::Main()
EXPECT_TRUE(TestMessage::getCnt() == 2);
EXPECT_TRUE(TestReply::getCnt() == 2);
{
- Routable::UP r = rq.dequeue(0);
- ASSERT_TRUE(r.get() != 0);
+ Routable::UP r = rq.dequeue();
+ ASSERT_TRUE(r);
EXPECT_TRUE(rq.size() == 3);
EXPECT_TRUE(r->getType() == 102);
}
EXPECT_TRUE(TestMessage::getCnt() == 1);
EXPECT_TRUE(TestReply::getCnt() == 2);
{
- Routable::UP r = rq.dequeue(0);
- ASSERT_TRUE(r.get() != 0);
+ Routable::UP r = rq.dequeue();
+ ASSERT_TRUE(r);
EXPECT_TRUE(rq.size() == 2);
EXPECT_TRUE(r->getType() == 202);
}
diff --git a/messagebus/src/tests/routing/routing.cpp b/messagebus/src/tests/routing/routing.cpp
index 42c5938fe92..48c86a53160 100644
--- a/messagebus/src/tests/routing/routing.cpp
+++ b/messagebus/src/tests/routing/routing.cpp
@@ -8,7 +8,6 @@
#include <vespa/messagebus/testlib/receptor.h>
#include <vespa/messagebus/testlib/simplemessage.h>
#include <vespa/messagebus/testlib/simpleprotocol.h>
-#include <vespa/messagebus/testlib/simplereply.h>
#include <vespa/messagebus/testlib/slobrok.h>
#include <vespa/messagebus/testlib/testserver.h>
#include <vespa/vespalib/component/vtag.h>
@@ -485,7 +484,7 @@ private:
bool testTrace(TestData &data, const std::vector<string> &expected);
bool testTrace(const std::vector<string> &expected, const Trace &trace);
- static const double RECEPTOR_TIMEOUT;
+ static const duration RECEPTOR_TIMEOUT;
public:
int Main() override;
@@ -540,7 +539,7 @@ public:
void requireThatDepthLimitCanBeIgnored(TestData &data);
};
-const double Test::RECEPTOR_TIMEOUT = 120.0;
+const duration Test::RECEPTOR_TIMEOUT = 120s;
TEST_APPHOOK(Test);
@@ -613,7 +612,7 @@ bool
Test::testAcknowledge(TestData &data)
{
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- if (!EXPECT_TRUE(msg.get() != NULL)) {
+ if (!EXPECT_TRUE(msg)) {
return false;
}
data._dstSession->acknowledge(std::move(msg));
@@ -632,7 +631,7 @@ bool
Test::testTrace(TestData &data, const std::vector<string> &expected)
{
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- if (!EXPECT_TRUE(reply.get() != NULL)) {
+ if (!EXPECT_TRUE(reply)) {
return false;
}
if (!EXPECT_TRUE(!reply->hasErrors())) {
@@ -747,7 +746,7 @@ Test::testNoRoutingTable(TestData &data)
EXPECT_TRUE(!res.isAccepted());
EXPECT_EQUAL((uint32_t)ErrorCode::ILLEGAL_ROUTE, res.getError().getCode());
Message::UP msg = res.getMessage();
- EXPECT_TRUE(msg.get() != NULL);
+ EXPECT_TRUE(msg);
}
void
@@ -759,7 +758,7 @@ Test::testUnknownRoute(TestData &data)
EXPECT_TRUE(!res.isAccepted());
EXPECT_EQUAL((uint32_t)ErrorCode::ILLEGAL_ROUTE, res.getError().getCode());
Message::UP msg = res.getMessage();
- EXPECT_TRUE(msg.get() != NULL);
+ EXPECT_TRUE(msg);
}
void
@@ -767,7 +766,7 @@ Test::testNoRoute(TestData &data)
{
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route()).isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::ILLEGAL_ROUTE, reply->getError(0).getCode());
}
@@ -779,10 +778,10 @@ Test::testRecognizeHopName(TestData &data)
.addHop(HopSpec("dst", "dst/session"))));
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
}
@@ -794,10 +793,10 @@ Test::testRecognizeRouteDirective(TestData &data)
.addHop(HopSpec("dir", "route:dst"))));
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dir")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
}
@@ -808,10 +807,10 @@ Test::testRecognizeRouteName(TestData &data)
.addRoute(RouteSpec("dst").addHop("dst/session"))));
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
}
@@ -823,7 +822,7 @@ Test::testHopResolutionOverflow(TestData &data)
.addHop(HopSpec("bar", "foo"))));
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("foo")).isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::ILLEGAL_ROUTE, reply->getError(0).getCode());
}
@@ -835,7 +834,7 @@ Test::testRouteResolutionOverflow(TestData &data)
.addRoute(RouteSpec("foo").addHop("route:foo"))));
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), "foo").isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::ILLEGAL_ROUTE, reply->getError(0).getCode());
}
@@ -847,13 +846,13 @@ Test::testInsertRoute(TestData &data)
.addRoute(RouteSpec("foo").addHop("dst/session").addHop("bar"))));
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("route:foo baz")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
EXPECT_EQUAL(2u, msg->getRoute().getNumHops());
EXPECT_EQUAL("bar", msg->getRoute().getHop(0).toString());
EXPECT_EQUAL("baz", msg->getRoute().getHop(1).toString());
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
}
@@ -864,7 +863,7 @@ Test::testErrorDirective(TestData &data)
route.getHop(0).setDirective(1, IHopDirective::SP(new ErrorDirective("err")));
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), route).isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::ILLEGAL_ROUTE, reply->getError(0).getCode());
EXPECT_EQUAL("err", reply->getError(0).getMessage());
@@ -879,7 +878,7 @@ Test::testSelectError(TestData &data)
data._srcServer.mb.putProtocol(protocol);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom: ]")).isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
LOG(info, "testSelectError trace=%s", reply->getTrace().toString().c_str());
LOG(info, "testSelectError error=%s", reply->getError(0).toString().c_str());
EXPECT_EQUAL(1u, reply->getNumErrors());
@@ -895,7 +894,7 @@ Test::testSelectNone(TestData &data)
data._srcServer.mb.putProtocol(protocol);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom]")).isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::NO_SERVICES_FOR_ROUTE, reply->getError(0).getCode());
}
@@ -909,10 +908,10 @@ Test::testSelectOne(TestData &data)
data._srcServer.mb.putProtocol(protocol);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom:dst/session]")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
}
@@ -922,22 +921,22 @@ Test::testResend1(TestData &data)
data._retryPolicy->setEnabled(true);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::APP_TRANSIENT_ERROR, "err1"));
data._dstSession->reply(std::move(reply));
msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
reply.reset(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::APP_TRANSIENT_ERROR, "err2"));
data._dstSession->reply(std::move(reply));
msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
EXPECT_TRUE(testTrace(StringList()
.add("[APP_TRANSIENT_ERROR @ localhost]: err1")
@@ -957,22 +956,22 @@ Test::testResend2(TestData &data)
data._retryPolicy->setEnabled(true);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom:dst/session]")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::APP_TRANSIENT_ERROR, "err1"));
data._dstSession->reply(std::move(reply));
msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
reply.reset(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::APP_TRANSIENT_ERROR, "err2"));
data._dstSession->reply(std::move(reply));
msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
EXPECT_TRUE(testTrace(StringList()
.add("Source session accepted a 3 byte message. 1 message(s) now pending.")
@@ -1022,13 +1021,13 @@ Test::testNoResend(TestData &data)
data._retryPolicy->setEnabled(false);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::APP_TRANSIENT_ERROR, "err1"));
data._dstSession->reply(std::move(reply));
reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::APP_TRANSIENT_ERROR, reply->getError(0).getCode());
}
@@ -1043,16 +1042,16 @@ Test::testSelectOnResend(TestData &data)
data._retryPolicy->setEnabled(true);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom:dst/session]")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::APP_TRANSIENT_ERROR, "err"));
data._dstSession->reply(std::move(reply));
msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
EXPECT_TRUE(testTrace(StringList()
.add("Selecting { 'dst/session' }.")
@@ -1075,16 +1074,16 @@ Test::testNoSelectOnResend(TestData &data)
data._retryPolicy->setEnabled(true);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom:dst/session]")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::APP_TRANSIENT_ERROR, "err"));
data._dstSession->reply(std::move(reply));
msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
EXPECT_TRUE(testTrace(StringList()
.add("Selecting { 'dst/session' }.")
@@ -1107,10 +1106,10 @@ Test::testCanConsumeError(TestData &data)
data._retryPolicy->setEnabled(false);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom:dst/session,dst/unknown]")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::NO_ADDRESS_FOR_SERVICE, reply->getError(0).getCode());
EXPECT_TRUE(testTrace(StringList()
@@ -1131,7 +1130,7 @@ Test::testCantConsumeError(TestData &data)
data._retryPolicy->setEnabled(false);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom:dst/unknown]")).isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
printf("%s", reply->getTrace().toString().c_str());
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::NO_ADDRESS_FOR_SERVICE, reply->getError(0).getCode());
@@ -1152,10 +1151,10 @@ Test::testNestedPolicies(TestData &data)
data._retryPolicy->setEnabled(false);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom:[Custom:dst/session],[Custom:dst/unknown]]")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::NO_ADDRESS_FOR_SERVICE, reply->getError(0).getCode());
}
@@ -1173,10 +1172,10 @@ Test::testRemoveReply(TestData &data)
data._retryPolicy->setEnabled(false);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom:[Custom:dst/session],[Custom:dst/unknown]]")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
EXPECT_TRUE(testTrace(StringList()
.add("[NO_ADDRESS_FOR_SERVICE @ localhost]")
@@ -1197,10 +1196,10 @@ Test::testSetReply(TestData &data)
data._retryPolicy->setEnabled(false);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Select:[SetReply:foo],dst/session]")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::APP_FATAL_ERROR, reply->getError(0).getCode());
EXPECT_EQUAL("foo", reply->getError(0).getMessage());
@@ -1221,16 +1220,16 @@ Test::testResendSetAndReuseReply(TestData &data)
data._retryPolicy->setEnabled(true);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[ReuseReply:[SetReply:foo],dst/session]")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::APP_TRANSIENT_ERROR, "dst"));
data._dstSession->reply(std::move(reply));
msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
}
@@ -1250,10 +1249,10 @@ Test::testResendSetAndRemoveReply(TestData &data)
data._retryPolicy->setEnabled(true);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[RemoveReply:[SetReply:foo],dst/session]")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::APP_FATAL_ERROR, reply->getError(0).getCode());
EXPECT_EQUAL("foo", reply->getError(0).getMessage());
@@ -1271,13 +1270,13 @@ Test::testHopIgnoresReply(TestData &data)
{
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("?dst/session")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::APP_FATAL_ERROR, "dst"));
data._dstSession->reply(std::move(reply));
reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
EXPECT_TRUE(testTrace(StringList()
.add("Not waiting for a reply from 'dst/session'."),
@@ -1291,13 +1290,13 @@ Test::testHopBlueprintIgnoresReply(TestData &data)
.addHop(HopSpec("foo", "dst/session").setIgnoreResult(true))));
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("foo")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
Reply::UP reply(new EmptyReply());
reply->swapState(*msg);
reply->addError(Error(ErrorCode::APP_FATAL_ERROR, "dst"));
data._dstSession->reply(std::move(reply));
reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_TRUE(!reply->hasErrors());
EXPECT_TRUE(testTrace(StringList()
.add("Not waiting for a reply from 'dst/session'."),
@@ -1309,12 +1308,12 @@ Test::testAcceptEmptyRoute(TestData &data)
{
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/session")).isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
const Route &route = msg->getRoute();
EXPECT_EQUAL(0u, route.getNumHops());
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
}
void
@@ -1333,7 +1332,7 @@ Test::testAbortOnlyActiveNodes(TestData &data)
data._retryPolicy->setEnabled(true);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Custom:[SetReply:foo],?bar,dst/session]")).isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(2u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::APP_FATAL_ERROR, reply->getError(0).getCode());
EXPECT_EQUAL((uint32_t)ErrorCode::SEND_ABORTED, reply->getError(1).getCode());
@@ -1344,7 +1343,7 @@ Test::testUnknownPolicy(TestData &data)
{
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("[Unknown]")).isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::UNKNOWN_POLICY, reply->getError(0).getCode());
}
@@ -1362,7 +1361,7 @@ Test::testSelectException(TestData &data)
Route::parse("[SelectException]"))
.isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::POLICY_ERROR,
reply->getError(0).getCode());
@@ -1383,10 +1382,10 @@ Test::testMergeException(TestData &data)
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), route)
.isAccepted());
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
data._dstSession->acknowledge(std::move(msg));
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::POLICY_ERROR,
reply->getError(0).getCode());
@@ -1423,7 +1422,7 @@ Test::requireThatIgnoreFlagIsSerializedWithMessage(TestData &data)
{
ASSERT_TRUE(testSend(data, "dst/session foo ?bar"));
Message::UP msg = data._dstHandler.getMessage(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
Route route = msg->getRoute();
EXPECT_EQUAL(2u, route.getNumHops());
Hop hop = route.getHop(0);
@@ -1533,10 +1532,10 @@ Test::testTimeout(TestData &data)
{
data._retryPolicy->setEnabled(true);
data._retryPolicy->setBaseDelay(0.01);
- data._srcSession->setTimeout(0.5);
+ data._srcSession->setTimeout(500ms);
EXPECT_TRUE(data._srcSession->send(createMessage("msg"), Route::parse("dst/unknown")).isAccepted());
Reply::UP reply = data._srcHandler.getReply(RECEPTOR_TIMEOUT);
- ASSERT_TRUE(reply.get() != NULL);
+ ASSERT_TRUE(reply);
EXPECT_EQUAL(2u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::NO_ADDRESS_FOR_SERVICE, reply->getError(0).getCode());
EXPECT_EQUAL((uint32_t)ErrorCode::TIMEOUT, reply->getError(1).getCode());
diff --git a/messagebus/src/tests/routingcontext/routingcontext.cpp b/messagebus/src/tests/routingcontext/routingcontext.cpp
index fa0d8ed6536..1c971b29ee3 100644
--- a/messagebus/src/tests/routingcontext/routingcontext.cpp
+++ b/messagebus/src/tests/routingcontext/routingcontext.cpp
@@ -23,7 +23,7 @@ using namespace mbus;
using vespalib::make_string;
-static const double TIMEOUT = 120;
+static const duration TIMEOUT = 120s;
class StringList : public std::vector<string> {
public:
diff --git a/messagebus/src/tests/sendadapter/sendadapter.cpp b/messagebus/src/tests/sendadapter/sendadapter.cpp
index c4fc0f908e0..aed4de7b228 100644
--- a/messagebus/src/tests/sendadapter/sendadapter.cpp
+++ b/messagebus/src/tests/sendadapter/sendadapter.cpp
@@ -59,7 +59,7 @@ public:
bool start();
};
-static const int TIMEOUT_SECS = 6;
+static const duration TIMEOUT_SECS = 6s;
TestData::TestData() :
_slobrok(),
@@ -121,7 +121,7 @@ testVersionedSend(TestData &data,
return false;
}
msg = data._itrHandler.getMessage(TIMEOUT_SECS);
- if (!EXPECT_TRUE(msg.get() != NULL)) {
+ if (!EXPECT_TRUE(msg)) {
return false;
}
LOG(info, "Message version %s serialized at source.",
@@ -138,7 +138,7 @@ testVersionedSend(TestData &data,
}
data._itrSession->forward(std::move(msg));
msg = data._dstHandler.getMessage(TIMEOUT_SECS);
- if (!EXPECT_TRUE(msg.get() != NULL)) {
+ if (!EXPECT_TRUE(msg)) {
return false;
}
LOG(info, "Message version %s serialized at intermediate.",
@@ -157,7 +157,7 @@ testVersionedSend(TestData &data,
reply->swapState(*msg);
data._dstSession->reply(std::move(reply));
reply = data._itrHandler.getReply();
- if (!EXPECT_TRUE(reply.get() != NULL)) {
+ if (!EXPECT_TRUE(reply)) {
return false;
}
LOG(info, "Reply version %s serialized at destination.",
@@ -173,7 +173,7 @@ testVersionedSend(TestData &data,
}
data._itrSession->forward(std::move(reply));
reply = data._srcHandler.getReply();
- if (!EXPECT_TRUE(reply.get() != NULL)) {
+ if (!EXPECT_TRUE(reply)) {
return false;
}
LOG(info, "Reply version %s serialized at intermediate.",
diff --git a/messagebus/src/tests/sequencer/sequencer.cpp b/messagebus/src/tests/sequencer/sequencer.cpp
index 218c1e43929..d347c3855cb 100644
--- a/messagebus/src/tests/sequencer/sequencer.cpp
+++ b/messagebus/src/tests/sequencer/sequencer.cpp
@@ -21,7 +21,7 @@ struct MyQueue : public RoutableQueue {
virtual ~MyQueue() {
while (size() > 0) {
- Routable::UP obj = dequeue(0);
+ Routable::UP obj = dequeue();
obj->getCallStack().discard();
}
}
@@ -31,14 +31,14 @@ struct MyQueue : public RoutableQueue {
LOG(error, "checkReply(): No reply in queue.");
return false;
}
- Routable::UP obj = dequeue(0);
+ Routable::UP obj = dequeue();
if (!obj->isReply()) {
LOG(error, "checkReply(): Got message when expecting reply.");
return false;
}
Reply::UP reply(static_cast<Reply*>(obj.release()));
Message::UP msg = reply->getMessage();
- if (msg.get() == NULL) {
+ if ( ! msg) {
LOG(error, "checkReply(): Reply has no message attached.");
return false;
}
@@ -64,7 +64,7 @@ struct MyQueue : public RoutableQueue {
}
void replyNext() {
- Routable::UP obj = dequeue(0);
+ Routable::UP obj = dequeue();
Message::UP msg(static_cast<Message*>(obj.release()));
Reply::UP reply(new EmptyReply());
diff --git a/messagebus/src/tests/shutdown/shutdown.cpp b/messagebus/src/tests/shutdown/shutdown.cpp
index 1706da3b55f..e415622707f 100644
--- a/messagebus/src/tests/shutdown/shutdown.cpp
+++ b/messagebus/src/tests/shutdown/shutdown.cpp
@@ -30,7 +30,7 @@ public:
}
};
-static const double TIMEOUT = 120;
+static const duration TIMEOUT = 120s;
TEST_APPHOOK(Test);
@@ -77,11 +77,11 @@ Test::requireThatShutdownOnSourceWithPendingIsSafe()
SourceSession::UP srcSession = srcServer.mb.createSourceSession(SourceSessionParams()
.setThrottlePolicy(IThrottlePolicy::SP())
.setReplyHandler(srcHandler));
- ASSERT_TRUE(srcSession.get() != NULL);
+ ASSERT_TRUE(srcSession);
ASSERT_TRUE(srcServer.waitSlobrok("dst/session", 1));
ASSERT_TRUE(srcSession->send(std::move(msg), "dst/session", true).isAccepted());
msg = dstHandler.getMessage(TIMEOUT);
- ASSERT_TRUE(msg.get() != NULL);
+ ASSERT_TRUE(msg);
}
dstSession->acknowledge(std::move(msg));
}
diff --git a/messagebus/src/tests/sourcesession/sourcesession.cpp b/messagebus/src/tests/sourcesession/sourcesession.cpp
index 5177cf0e799..c793dd435c8 100644
--- a/messagebus/src/tests/sourcesession/sourcesession.cpp
+++ b/messagebus/src/tests/sourcesession/sourcesession.cpp
@@ -102,11 +102,11 @@ Test::testSequencing()
FastOS_Thread::Sleep(250);
EXPECT_TRUE(waitQueueSize(dstQ, 2));
EXPECT_TRUE(waitQueueSize(srcQ, 0));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
EXPECT_TRUE(waitQueueSize(srcQ, 2));
EXPECT_TRUE(waitQueueSize(dstQ, 1));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
ASSERT_TRUE(waitQueueSize(srcQ, 3));
ASSERT_TRUE(waitQueueSize(dstQ, 0));
}
@@ -137,7 +137,7 @@ Test::testResendError()
}
EXPECT_TRUE(waitQueueSize(dstQ, 1));
{
- Routable::UP r = dstQ.dequeue(0);
+ Routable::UP r = dstQ.dequeue();
Reply::UP reply(new EmptyReply());
r->swapState(*reply);
reply->addError(Error(ErrorCode::FATAL_ERROR, "error"));
@@ -153,7 +153,7 @@ Test::testResendError()
}
EXPECT_TRUE(waitQueueSize(dstQ, 1));
{
- Routable::UP r = dstQ.dequeue(0);
+ Routable::UP r = dstQ.dequeue();
Reply::UP reply(new EmptyReply());
r->swapState(*reply);
reply->addError(Error(ErrorCode::TRANSIENT_ERROR, "error"));
@@ -161,12 +161,12 @@ Test::testResendError()
}
EXPECT_TRUE(waitQueueSize(dstQ, 1));
EXPECT_TRUE(waitQueueSize(srcQ, 1));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
ASSERT_TRUE(waitQueueSize(srcQ, 2));
ASSERT_TRUE(waitQueueSize(dstQ, 0));
{
- string trace1 = srcQ.dequeue(0)->getTrace().toString();
- string trace2 = srcQ.dequeue(0)->getTrace().toString();
+ string trace1 = srcQ.dequeue()->getTrace().toString();
+ string trace2 = srcQ.dequeue()->getTrace().toString();
fprintf(stderr, "\nTRACE DUMP:\n%s\n\n", trace1.c_str());
fprintf(stderr, "\nTRACE DUMP:\n%s\n\n", trace2.c_str());
}
@@ -202,7 +202,7 @@ Test::testResendConnDown()
msg->getTrace().setLevel(9);
EXPECT_TRUE(ss->send(std::move(msg), "dst").isAccepted());
EXPECT_TRUE(waitQueueSize(dst2Q, 1));
- Routable::UP obj = dst2Q.dequeue(0);
+ Routable::UP obj = dst2Q.dequeue();
obj->discard();
src.mb.setupRouting(RoutingSpec().addTable(RoutingTableSpec(SimpleProtocol::NAME)
.addHop(HopSpec("dst", "dst/session"))));
@@ -210,11 +210,11 @@ Test::testResendConnDown()
ASSERT_TRUE(waitQueueSize(dstQ, 1)); // fails
ASSERT_TRUE(waitQueueSize(srcQ, 0));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
ASSERT_TRUE(waitQueueSize(srcQ, 1));
ASSERT_TRUE(waitQueueSize(dstQ, 0));
- string trace = srcQ.dequeue(0)->getTrace().toString();
+ string trace = srcQ.dequeue()->getTrace().toString();
fprintf(stderr, "\nTRACE DUMP:\n%s\n\n", trace.c_str());
}
@@ -240,7 +240,7 @@ Test::testIllegalRoute()
ASSERT_TRUE(waitQueueSize(srcQ, 1));
{
while (srcQ.size() > 0) {
- Routable::UP routable = srcQ.dequeue(0);
+ Routable::UP routable = srcQ.dequeue();
ASSERT_TRUE(routable->isReply());
Reply::UP r(static_cast<Reply*>(routable.release()));
EXPECT_EQUAL(1u, r->getNumErrors());
@@ -272,7 +272,7 @@ Test::testNoServices()
ASSERT_TRUE(waitQueueSize(srcQ, 1));
{
while (srcQ.size() > 0) {
- Routable::UP routable = srcQ.dequeue(0);
+ Routable::UP routable = srcQ.dequeue();
ASSERT_TRUE(routable->isReply());
Reply::UP r(static_cast<Reply*>(routable.release()));
EXPECT_TRUE(r->getNumErrors() == 1);
@@ -300,7 +300,7 @@ Test::testBlockingClose()
EXPECT_TRUE(ss->send(Message::UP(new SimpleMessage("foo")), "dst").isAccepted());
ss->close();
srcQ.handleMessage(Message::UP(new SimpleMessage("bogus")));
- Routable::UP routable = srcQ.dequeue(0);
+ Routable::UP routable = srcQ.dequeue();
EXPECT_TRUE(routable->isReply());
}
diff --git a/messagebus/src/tests/throttling/throttling.cpp b/messagebus/src/tests/throttling/throttling.cpp
index 5d3525e8ba6..6599604bf9a 100644
--- a/messagebus/src/tests/throttling/throttling.cpp
+++ b/messagebus/src/tests/throttling/throttling.cpp
@@ -3,7 +3,6 @@
#include <vespa/vespalib/testkit/testapp.h>
#include <vespa/messagebus/destinationsession.h>
#include <vespa/messagebus/dynamicthrottlepolicy.h>
-#include <vespa/messagebus/messagebus.h>
#include <vespa/messagebus/routablequeue.h>
#include <vespa/messagebus/routing/retrytransienterrorspolicy.h>
#include <vespa/messagebus/routing/routingspec.h>
@@ -12,7 +11,6 @@
#include <vespa/messagebus/staticthrottlepolicy.h>
#include <vespa/messagebus/testlib/slobrok.h>
#include <vespa/messagebus/testlib/simplemessage.h>
-#include <vespa/messagebus/testlib/simpleprotocol.h>
#include <vespa/messagebus/testlib/simplereply.h>
#include <vespa/messagebus/testlib/testserver.h>
@@ -141,15 +139,15 @@ Test::testMaxPendingCount()
EXPECT_TRUE(!ss->send(Message::UP(new SimpleMessage("1234567890")), "dst").isAccepted());
EXPECT_TRUE(waitQueueSize(dstQ, 5));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
ASSERT_TRUE(waitQueueSize(srcQ, 1));
EXPECT_TRUE(ss->send(Message::UP(new SimpleMessage("1234567890")), "dst").isAccepted());
EXPECT_TRUE(!ss->send(Message::UP(new SimpleMessage("1234567890")), "dst").isAccepted());
EXPECT_TRUE(waitQueueSize(dstQ, 5));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
ASSERT_TRUE(waitQueueSize(srcQ, 3));
EXPECT_TRUE(ss->send(Message::UP(new SimpleMessage("1234567890")), "dst").isAccepted());
@@ -158,11 +156,11 @@ Test::testMaxPendingCount()
EXPECT_TRUE(!ss->send(Message::UP(new SimpleMessage("1234567890")), "dst").isAccepted());
EXPECT_TRUE(waitQueueSize(dstQ, 5));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
ASSERT_TRUE(waitQueueSize(srcQ, 8));
ASSERT_TRUE(waitQueueSize(dstQ, 0));
}
@@ -202,17 +200,17 @@ Test::testMaxPendingSize()
EXPECT_TRUE(!ss->send(Message::UP(new SimpleMessage("1")), "dst").isAccepted());
EXPECT_TRUE(waitQueueSize(dstQ, 2));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
ASSERT_TRUE(waitQueueSize(srcQ, 1));
EXPECT_TRUE(!ss->send(Message::UP(new SimpleMessage("1")), "dst").isAccepted());
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
ASSERT_TRUE(waitQueueSize(srcQ, 2));
EXPECT_TRUE(ss->send(Message::UP(new SimpleMessage("12")), "dst").isAccepted());
EXPECT_TRUE(!ss->send(Message::UP(new SimpleMessage("1")), "dst").isAccepted());
EXPECT_TRUE(waitQueueSize(dstQ, 1));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
ASSERT_TRUE(waitQueueSize(srcQ, 3));
}
@@ -244,7 +242,7 @@ Test::testMinOne()
EXPECT_TRUE(!ss->send(Message::UP(new SimpleMessage("")), "dst").isAccepted());
EXPECT_TRUE(waitQueueSize(dstQ, 1));
- ds->acknowledge(Message::UP((Message*)dstQ.dequeue(0).release()));
+ ds->acknowledge(Message::UP((Message*)dstQ.dequeue().release()));
ASSERT_TRUE(waitQueueSize(srcQ, 1));
EXPECT_TRUE(waitQueueSize(dstQ, 0));
}
diff --git a/messagebus/src/tests/timeout/timeout.cpp b/messagebus/src/tests/timeout/timeout.cpp
index b2631e13d9c..980681a9d42 100644
--- a/messagebus/src/tests/timeout/timeout.cpp
+++ b/messagebus/src/tests/timeout/timeout.cpp
@@ -76,7 +76,7 @@ Test::testMessageExpires()
EXPECT_EQUAL(1u, reply->getNumErrors());
EXPECT_EQUAL((uint32_t)ErrorCode::TIMEOUT, reply->getError(0).getCode());
- Message::UP msg = dstHandler.getMessage(1);
+ Message::UP msg = dstHandler.getMessage(1s);
if (msg) {
msg->discard();
}