summaryrefslogtreecommitdiffstats
path: root/messagebus
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-04-02 10:52:34 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-04-02 10:52:34 +0000
commit9c3b09bbdd2d3819ae2edb35b867d996daa4a744 (patch)
tree4f181b5ad0dffb7a802ecf78ee669ead37f6df69 /messagebus
parent676dc64e73f418be10ef4cee68b102068bbc5530 (diff)
Unify tests.
Diffstat (limited to 'messagebus')
-rw-r--r--messagebus/src/tests/error/error.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/messagebus/src/tests/error/error.cpp b/messagebus/src/tests/error/error.cpp
index 6ac15ae4015..244efe0bf99 100644
--- a/messagebus/src/tests/error/error.cpp
+++ b/messagebus/src/tests/error/error.cpp
@@ -46,27 +46,27 @@ TEST("error_test") {
ASSERT_TRUE(pxyNet.waitSlobrok("test/dst/session"));
for (int i = 0; i < 5; i++) {
- ASSERT_TRUE(ss->send(SimpleMessage::UP(new SimpleMessage("test message")), "test").isAccepted());
+ ASSERT_TRUE(ss->send(std::make_unique<SimpleMessage>("test message"), "test").isAccepted());
Message::UP msg = pxy.getMessage();
- ASSERT_TRUE(msg.get() != 0);
+ ASSERT_TRUE(msg);
is->forward(std::move(msg));
msg = dst.getMessage();
- ASSERT_TRUE(msg.get() != 0);
- Reply::UP reply(new EmptyReply());
+ ASSERT_TRUE(msg);
+ Reply::UP reply = std::make_unique<EmptyReply>();
msg->swapState(*reply);
reply->addError(Error(ErrorCode::APP_FATAL_ERROR, "fatality"));
ds->reply(std::move(reply));
reply = pxy.getReply();
- ASSERT_TRUE(reply.get() != 0);
+ ASSERT_TRUE(reply);
ASSERT_EQUAL(reply->getNumErrors(), 1u);
EXPECT_EQUAL(reply->getError(0).getService(), "test/dst/session");
reply->addError(Error(ErrorCode::APP_FATAL_ERROR, "fatality"));
is->forward(std::move(reply));
reply = src.getReply();
- ASSERT_TRUE(reply.get() != 0);
+ ASSERT_TRUE(reply);
ASSERT_EQUAL(reply->getNumErrors(), 2u);
EXPECT_EQUAL(reply->getError(0).getService(), "test/dst/session");
EXPECT_EQUAL(reply->getError(1).getService(), "test/pxy/session");