From 3449bdead4b7f1db519c242e7b02f756fa169947 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 4 Dec 2019 20:14:04 +0000 Subject: Use getMessageNow --- messagebus/src/tests/advancedrouting/advancedrouting.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'messagebus') 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()); -- cgit v1.2.3