diff options
| author | Henning Baldersheim <balder@oath.com> | 2018-10-04 22:05:19 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@oath.com> | 2018-10-04 22:05:19 +0200 |
| commit | 0bdd3c5fa4326ed4106b9aee0585d57c7193bd97 (patch) | |
| tree | 2b519cf259eb30ab28d85fc560a589457f54ed17 /documentapi/src/tests/policyfactory/policyfactory.cpp | |
| parent | 3f2b1a9230fbab12f2e8b5afcf1e0ad72f3d872a (diff) | |
Remove the costly and unnecessary setSlobrokId interface.
Diffstat (limited to 'documentapi/src/tests/policyfactory/policyfactory.cpp')
| -rw-r--r-- | documentapi/src/tests/policyfactory/policyfactory.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/documentapi/src/tests/policyfactory/policyfactory.cpp b/documentapi/src/tests/policyfactory/policyfactory.cpp index ef8c461ad02..41905183928 100644 --- a/documentapi/src/tests/policyfactory/policyfactory.cpp +++ b/documentapi/src/tests/policyfactory/policyfactory.cpp @@ -54,13 +54,13 @@ public: mbus::IRoutingPolicy::UP MyFactory::createPolicy(const string ¶m) const { - return mbus::IRoutingPolicy::UP(new MyPolicy(param)); + return std::make_unique<MyPolicy>(param); } mbus::Message::UP createMessage() { - mbus::Message::UP ret(new RemoveDocumentMessage(document::DocumentId("doc:scheme:"))); + auto ret = std::make_unique<RemoveDocumentMessage>(document::DocumentId("doc:scheme:")); ret->getTrace().setLevel(9); return ret; } @@ -82,27 +82,27 @@ Test::Main() mbus::Slobrok slobrok; LoadTypeSet loadTypes; mbus::TestServer - srv(mbus::MessageBusParams().addProtocol(mbus::IProtocol::SP(new DocumentProtocol(loadTypes, repo))), - mbus::RPCNetworkParams().setSlobrokConfig(slobrok.config())); + srv(mbus::MessageBusParams().addProtocol(std::make_shared<DocumentProtocol>(loadTypes, repo)), + mbus::RPCNetworkParams(slobrok.config())); mbus::Receptor handler; mbus::SourceSession::UP src = srv.mb.createSourceSession(mbus::SourceSessionParams().setReplyHandler(handler)); mbus::Route route = mbus::Route::parse("[MyPolicy]"); ASSERT_TRUE(src->send(createMessage(), route).isAccepted()); mbus::Reply::UP reply = static_cast<mbus::Receptor&>(src->getReplyHandler()).getReply(600); - ASSERT_TRUE(reply.get() != NULL); + ASSERT_TRUE(reply); fprintf(stderr, "%s", reply->getTrace().toString().c_str()); EXPECT_EQUAL(1u, reply->getNumErrors()); EXPECT_EQUAL((uint32_t)mbus::ErrorCode::UNKNOWN_POLICY, reply->getError(0).getCode()); mbus::IProtocol * obj = srv.mb.getProtocol(DocumentProtocol::NAME); DocumentProtocol * protocol = dynamic_cast<DocumentProtocol*>(obj); - ASSERT_TRUE(protocol != NULL); - protocol->putRoutingPolicyFactory("MyPolicy", IRoutingPolicyFactory::SP(new MyFactory())); + ASSERT_TRUE(protocol != nullptr); + protocol->putRoutingPolicyFactory("MyPolicy", std::make_shared<MyFactory>()); ASSERT_TRUE(src->send(createMessage(), route).isAccepted()); reply = static_cast<mbus::Receptor&>(src->getReplyHandler()).getReply(600); - ASSERT_TRUE(reply.get() != NULL); + ASSERT_TRUE(reply); fprintf(stderr, "%s", reply->getTrace().toString().c_str()); EXPECT_EQUAL(1u, reply->getNumErrors()); EXPECT_EQUAL((uint32_t)DocumentProtocol::ERROR_POLICY_FAILURE, reply->getError(0).getCode()); |