Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-01 17:23:49 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-04 08:28:23 (GMT)
commit741c45b74d5f634622eb5f757c49323274fb8937 (patch)
treeb9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp
parenteddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff)
downloadswift-741c45b74d5f634622eb5f757c49323274fb8937.zip
swift-741c45b74d5f634622eb5f757c49323274fb8937.tar.bz2
Modernize code to use C++11 shared_ptr instead of Boost's
This change was done by applying the following 'gsed' replacement calls to all source files: 's/\#include <boost\/shared_ptr\.hpp>/\#include <memory>/g' 's/\#include <boost\/enable_shared_from_this\.hpp>/\#include <memory>/g' 's/\#include <boost\/smart_ptr\/make_shared\.hpp>/\#include <memory>/g' 's/\#include <boost\/make_shared\.hpp>/\#include <memory>/g' 's/\#include <boost\/weak_ptr\.hpp>/\#include <memory>/g' 's/boost::make_shared/std::make_shared/g' 's/boost::dynamic_pointer_cast/std::dynamic_pointer_cast/g' 's/boost::shared_ptr/std::shared_ptr/g' 's/boost::weak_ptr/std::weak_ptr/g' 's/boost::enable_shared_from_this/std::enable_shared_from_this/g' The remaining issues have been fixed manually. Test-Information: Code builds on OS X 10.11.4 and unit tests pass. Change-Id: Ia7ae34eab869fb9ad6387a1348426b71ae4acd5f
Diffstat (limited to 'Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp')
-rw-r--r--Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp b/Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp
index 6d8ba97..a80d748 100644
--- a/Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp
+++ b/Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp
@@ -5,9 +5,9 @@
*/
#include <map>
+#include <memory>
#include <boost/bind.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
@@ -45,7 +45,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
public:
void setUp() {
eventLoop = new DummyEventLoop();
- querier = boost::make_shared<FakeDNSSDQuerier>("wonderland.lit", eventLoop);
+ querier = std::make_shared<FakeDNSSDQuerier>("wonderland.lit", eventLoop);
aliceServiceID = new DNSSDServiceID("alice", "wonderland.lit");
aliceServiceInfo = new DNSSDResolveServiceQuery::Result("_presence._tcp.wonderland.lit", "xmpp.wonderland.lit", 1234, LinkLocalServiceInfo().toTXTRecord());
testServiceID = new DNSSDServiceID("foo", "bar.local");
@@ -70,14 +70,14 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testConstructor() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
CPPUNIT_ASSERT(!testling->isRunning());
CPPUNIT_ASSERT(!testling->hasError());
}
void testStart() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
CPPUNIT_ASSERT(testling->isRunning());
@@ -87,7 +87,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testServiceAdded() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
eventLoop->processEvents();
@@ -109,7 +109,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testServiceAdded_NoServiceInfo() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
eventLoop->processEvents();
@@ -123,7 +123,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testServiceAdded_RegisteredService() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
eventLoop->processEvents();
@@ -140,7 +140,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testServiceAdded_UnregisteredService() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
eventLoop->processEvents();
testling->registerService("alice", 1234, LinkLocalServiceInfo());
@@ -166,7 +166,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testServiceRemoved_UnregisteredService() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
eventLoop->processEvents();
testling->registerService("alice", 1234, LinkLocalServiceInfo());
@@ -183,7 +183,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testServiceAdded_Twice() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
eventLoop->processEvents();
@@ -208,7 +208,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
void testServiceChanged() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
querier->setServiceInfo(*testServiceID,*testServiceInfo);
querier->addService(*testServiceID);
@@ -231,7 +231,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testServiceRemoved() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
querier->setServiceInfo(*testServiceID,*testServiceInfo);
querier->addService(*testServiceID);
@@ -252,7 +252,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testError_BrowseErrorAfterStart() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
querier->setBrowseError();
@@ -264,7 +264,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testError_BrowseErrorAfterResolve() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
querier->setServiceInfo(*testServiceID,*testServiceInfo);
querier->addService(*testServiceID);
@@ -283,7 +283,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testRegisterService() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
eventLoop->processEvents();
@@ -299,7 +299,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testRegisterService_Error() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
LinkLocalServiceInfo info;
testling->registerService("foo@bar", 1234, info);
@@ -315,7 +315,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testRegisterService_Reregister() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
eventLoop->processEvents();
LinkLocalServiceInfo info;
@@ -335,7 +335,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
void testUpdateService() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+ std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
testling->start();
eventLoop->processEvents();
@@ -352,8 +352,8 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
}
private:
- boost::shared_ptr<LinkLocalServiceBrowser> createTestling() {
- boost::shared_ptr<LinkLocalServiceBrowser> testling(
+ std::shared_ptr<LinkLocalServiceBrowser> createTestling() {
+ std::shared_ptr<LinkLocalServiceBrowser> testling(
new LinkLocalServiceBrowser(querier));
testling->onServiceAdded.connect(boost::bind(
&LinkLocalServiceBrowserTest::handleServiceAdded, this, _1));
@@ -397,7 +397,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
private:
DummyEventLoop* eventLoop;
- boost::shared_ptr<FakeDNSSDQuerier> querier;
+ std::shared_ptr<FakeDNSSDQuerier> querier;
std::vector<LinkLocalService> addedServices;
std::vector<LinkLocalService> changedServices;
std::vector<LinkLocalService> removedServices;