aboutsummaryrefslogtreecommitdiffstats
path: root/messagebus
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-12-04 20:14:04 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-12-04 20:14:04 +0000
commit3449bdead4b7f1db519c242e7b02f756fa169947 (patch)
tree3d8709e47ac199ece2195a66ff1c946370c45a32 /messagebus
parent56626f708cc74f404d15affd28d3511a6b76b49f (diff)
Use getMessageNow
Diffstat (limited to 'messagebus')
-rw-r--r--messagebus/src/tests/advancedrouting/advancedrouting.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/messagebus/src/tests/advancedrouting/advancedrouting.cpp b/messagebus/src/tests/advancedrouting/advancedrouting.cpp
index f1557b8a305..1854662defd 100644
--- a/messagebus/src/tests/advancedrouting/advancedrouting.cpp
+++ b/messagebus/src/tests/advancedrouting/advancedrouting.cpp
@@ -146,8 +146,8 @@ Test::testAdvanced(TestData &data)
data._bazSession->reply(std::move(reply));
// First retry.
- msg = data._fooHandler.getMessage(duration::zero());
- ASSERT_TRUE(msg.get() == NULL);
+ msg = data._fooHandler.getMessageNow();
+ ASSERT_FALSE(msg);
msg = data._barHandler.getMessage(TIMEOUT);
ASSERT_TRUE(msg);
data._barSession->acknowledge(std::move(msg));
@@ -159,10 +159,10 @@ Test::testAdvanced(TestData &data)
data._bazSession->reply(std::move(reply));
// Second retry.
- msg = data._fooHandler.getMessage(duration::zero());
- ASSERT_TRUE(msg.get() == NULL);
- msg = data._barHandler.getMessage(duration::zero());
- ASSERT_TRUE(msg.get() == NULL);
+ msg = data._fooHandler.getMessageNow();
+ ASSERT_FALSE(msg);
+ msg = data._barHandler.getMessageNow();
+ ASSERT_FALSE(msg);
msg = data._bazHandler.getMessage(TIMEOUT);
ASSERT_TRUE(msg);
reply.reset(new EmptyReply());