From 2e750697d796eef9e0dccb5059af393f44930cc0 2016-09-16 23:45:26 From: Vladimír Matěna Date: 2016-09-16 23:45:26 Subject: [PATCH] Avoid calls to get() on shared pointers in UserRegistryTest --- diff --git a/tests/libtransport/userregistry.cpp b/tests/libtransport/userregistry.cpp index 2cbbc3af4b764ef96a53f2a204344fa79840a60c..84fd61bbd6127f833291a6fb647dc47c370215ba 100644 --- a/tests/libtransport/userregistry.cpp +++ b/tests/libtransport/userregistry.cpp @@ -40,23 +40,23 @@ class UserRegistryTest : public CPPUNIT_NS :: TestFixture { connectionServer = server->getConnectionServer(); client1 = factories->getConnectionFactory()->createConnection(); - dynamic_cast(connectionServer.get())->acceptConnection(client1); + SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(connectionServer)->acceptConnection(client1); - dynamic_cast(client1.get())->onDataSent.connect(boost::bind(&UserRegistryTest::handleDataReceived, this, _1, client1)); + SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(client1)->onDataSent.connect(boost::bind(&UserRegistryTest::handleDataReceived, this, _1, client1)); client2 = factories->getConnectionFactory()->createConnection(); - dynamic_cast(connectionServer.get())->acceptConnection(client2); + SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(connectionServer)->acceptConnection(client2); - dynamic_cast(client2.get())->onDataSent.connect(boost::bind(&UserRegistryTest::handleDataReceived, this, _1, client2)); + SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(client2)->onDataSent.connect(boost::bind(&UserRegistryTest::handleDataReceived, this, _1, client2)); loop->processEvents(); } void tearDown (void) { delete server; - dynamic_cast(client1.get())->onDataSent.disconnect_all_slots(); + SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(client1)->onDataSent.disconnect_all_slots(); client1.reset(); - dynamic_cast(client2.get())->onDataSent.disconnect_all_slots(); + SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(client2)->onDataSent.disconnect_all_slots(); client2.reset(); connectionServer.reset(); delete userRegistry; @@ -68,7 +68,7 @@ class UserRegistryTest : public CPPUNIT_NS :: TestFixture { } void send(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr conn, const std::string &data) { - dynamic_cast(conn.get())->receive(Swift::createSafeByteArray(data)); + SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(conn)->receive(Swift::createSafeByteArray(data)); loop->processEvents(); }