From f9913fa28a27f23fde2d4956c62cbb2fb2bc2ee8 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 21 Nov 2013 22:16:57 +0100 Subject: Boost/C++11 shared pointers. --- tests/net/smtp/SMTPTransportTest.cpp | 80 ++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'tests/net/smtp/SMTPTransportTest.cpp') diff --git a/tests/net/smtp/SMTPTransportTest.cpp b/tests/net/smtp/SMTPTransportTest.cpp index 13c18309..5997588e 100644 --- a/tests/net/smtp/SMTPTransportTest.cpp +++ b/tests/net/smtp/SMTPTransportTest.cpp @@ -44,25 +44,25 @@ VMIME_TEST_SUITE_BEGIN(SMTPTransportTest) void testConnectToInvalidServer() { - vmime::ref sess - = vmime::create (); + vmime::shared_ptr sess + = vmime::make_shared (); vmime::utility::url url("smtp://invalid-smtp-server"); - vmime::ref store = sess->getTransport(url); + vmime::shared_ptr store = sess->getTransport(url); VASSERT_THROW("connect", store->connect(), vmime::exceptions::connection_error); } void testGreetingError() { - vmime::ref session = - vmime::create (); + vmime::shared_ptr session = + vmime::make_shared (); - vmime::ref tr = session->getTransport + vmime::shared_ptr tr = session->getTransport (vmime::utility::url("smtp://localhost")); - tr->setSocketFactory(vmime::create >()); - tr->setTimeoutHandlerFactory(vmime::create ()); + tr->setSocketFactory(vmime::make_shared >()); + tr->setTimeoutHandlerFactory(vmime::make_shared ()); VASSERT_THROW("Connection", tr->connect(), vmime::exceptions::connection_greeting_error); @@ -70,23 +70,23 @@ VMIME_TEST_SUITE_BEGIN(SMTPTransportTest) void testMAILandRCPT() { - vmime::ref session = - vmime::create (); + vmime::shared_ptr session = + vmime::make_shared (); - vmime::ref tr = session->getTransport + vmime::shared_ptr tr = session->getTransport (vmime::utility::url("smtp://localhost")); - tr->setSocketFactory(vmime::create >()); - tr->setTimeoutHandlerFactory(vmime::create ()); + tr->setSocketFactory(vmime::make_shared >()); + tr->setTimeoutHandlerFactory(vmime::make_shared ()); VASSERT_NO_THROW("Connection", tr->connect()); vmime::mailbox exp("expeditor@test.vmime.org"); vmime::mailboxList recips; - recips.appendMailbox(vmime::create ("recipient1@test.vmime.org")); - recips.appendMailbox(vmime::create ("recipient2@test.vmime.org")); - recips.appendMailbox(vmime::create ("recipient3@test.vmime.org")); + recips.appendMailbox(vmime::make_shared ("recipient1@test.vmime.org")); + recips.appendMailbox(vmime::make_shared ("recipient2@test.vmime.org")); + recips.appendMailbox(vmime::make_shared ("recipient3@test.vmime.org")); vmime::string data("Message data"); vmime::utility::inputStreamStringAdapter is(data); @@ -96,52 +96,52 @@ VMIME_TEST_SUITE_BEGIN(SMTPTransportTest) void testChunking() { - vmime::ref session = - vmime::create (); + vmime::shared_ptr session = + vmime::make_shared (); - vmime::ref tr = session->getTransport + vmime::shared_ptr tr = session->getTransport (vmime::utility::url("smtp://localhost")); - tr->setSocketFactory(vmime::create >()); - tr->setTimeoutHandlerFactory(vmime::create ()); + tr->setSocketFactory(vmime::make_shared >()); + tr->setTimeoutHandlerFactory(vmime::make_shared ()); tr->connect(); VASSERT("Test server should report it supports the CHUNKING extension!", - tr.dynamicCast ()->getConnection()->hasExtension("CHUNKING")); + vmime::dynamicCast (tr)->getConnection()->hasExtension("CHUNKING")); vmime::mailbox exp("expeditor@test.vmime.org"); vmime::mailboxList recips; - recips.appendMailbox(vmime::create ("recipient@test.vmime.org")); + recips.appendMailbox(vmime::make_shared ("recipient@test.vmime.org")); - vmime::ref msg = vmime::create (); + vmime::shared_ptr msg = vmime::make_shared (); tr->send(msg, exp, recips); } void testSize_Chunking() { - vmime::ref session = - vmime::create (); + vmime::shared_ptr session = + vmime::make_shared (); - vmime::ref tr = session->getTransport + vmime::shared_ptr tr = session->getTransport (vmime::utility::url("smtp://localhost")); - tr->setSocketFactory(vmime::create > >()); - tr->setTimeoutHandlerFactory(vmime::create ()); + tr->setSocketFactory(vmime::make_shared > >()); + tr->setTimeoutHandlerFactory(vmime::make_shared ()); tr->connect(); VASSERT("Test server should report it supports the SIZE extension!", - tr.dynamicCast ()->getConnection()->hasExtension("SIZE")); + vmime::dynamicCast (tr)->getConnection()->hasExtension("SIZE")); vmime::mailbox exp("expeditor@test.vmime.org"); vmime::mailboxList recips; - recips.appendMailbox(vmime::create ("recipient@test.vmime.org")); + recips.appendMailbox(vmime::make_shared ("recipient@test.vmime.org")); - vmime::ref msg = vmime::create (); + vmime::shared_ptr msg = vmime::make_shared (); VASSERT_THROW("Connection", tr->send(msg, exp, recips), vmime::net::smtp::SMTPMessageSizeExceedsMaxLimitsException); @@ -149,26 +149,26 @@ VMIME_TEST_SUITE_BEGIN(SMTPTransportTest) void testSize_NoChunking() { - vmime::ref session = - vmime::create (); + vmime::shared_ptr session = + vmime::make_shared (); - vmime::ref tr = session->getTransport + vmime::shared_ptr tr = session->getTransport (vmime::utility::url("smtp://localhost")); - tr->setSocketFactory(vmime::create > >()); - tr->setTimeoutHandlerFactory(vmime::create ()); + tr->setSocketFactory(vmime::make_shared > >()); + tr->setTimeoutHandlerFactory(vmime::make_shared ()); tr->connect(); VASSERT("Test server should report it supports the SIZE extension!", - tr.dynamicCast ()->getConnection()->hasExtension("SIZE")); + vmime::dynamicCast (tr)->getConnection()->hasExtension("SIZE")); vmime::mailbox exp("expeditor@test.vmime.org"); vmime::mailboxList recips; - recips.appendMailbox(vmime::create ("recipient@test.vmime.org")); + recips.appendMailbox(vmime::make_shared ("recipient@test.vmime.org")); - vmime::ref msg = vmime::create (); + vmime::shared_ptr msg = vmime::make_shared (); VASSERT_THROW("Connection", tr->send(msg, exp, recips), vmime::net::smtp::SMTPMessageSizeExceedsMaxLimitsException); -- cgit v1.2.3