libtransport.git Changeset - 2e750697d796

Changeset - 2e750697d796

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Vladimír Matěna - 9 years ago 2016-09-16 23:45:26
vlada.matena@gmail.com

Avoid calls to get() on shared pointers in UserRegistryTest

1 file changed with 7 insertions and 7 deletions:

tests/libtransport/userregistry.cpp

0 comments (0 inline, 0 general)

tests/libtransport/userregistry.cpp

➞

Show inline comments

@@ @@ -19,77 +19,77 @@ class UserRegistryTest : public CPPUNIT_NS :: TestFixture { @@
 	CPPUNIT_TEST(loginDisconnect);
 	CPPUNIT_TEST(removeLater);
 	CPPUNIT_TEST_SUITE_END();
 	public:
 		void setUp (void) {
 			state1 = Init;
 			state2 = Init;
 			std::istringstream ifs;
 			cfg = new Config();
 			cfg->load(ifs);
 			loop = new Swift::DummyEventLoop();
 			factories = new Swift::DummyNetworkFactories(loop);
 			userRegistry = new UserRegistry(cfg, factories);
 			userRegistry->onConnectUser.connect(bind(&UserRegistryTest::handleConnectUser, this, _1));
 			userRegistry->onDisconnectUser.connect(bind(&UserRegistryTest::handleDisconnectUser, this, _1));
 			server = new Swift::Server(loop, factories, userRegistry, "localhost", "0.0.0.0", 5222);
 			server->start();
 			connectionServer = server->getConnectionServer();
 			client1 = factories->getConnectionFactory()->createConnection();
-			dynamic_cast<Swift::DummyConnectionServer *>(connectionServer.get())->acceptConnection(client1);
+			SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast<Swift::DummyConnectionServer>(connectionServer)->acceptConnection(client1);
-			dynamic_cast<Swift::DummyConnection *>(client1.get())->onDataSent.connect(boost::bind(&UserRegistryTest::handleDataReceived, this, _1, client1));
+			SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast<Swift::DummyConnection>(client1)->onDataSent.connect(boost::bind(&UserRegistryTest::handleDataReceived, this, _1, client1));
 			client2 = factories->getConnectionFactory()->createConnection();
-			dynamic_cast<Swift::DummyConnectionServer *>(connectionServer.get())->acceptConnection(client2);
+			SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast<Swift::DummyConnectionServer>(connectionServer)->acceptConnection(client2);
-			dynamic_cast<Swift::DummyConnection *>(client2.get())->onDataSent.connect(boost::bind(&UserRegistryTest::handleDataReceived, this, _1, client2));
+			SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast<Swift::DummyConnection>(client2)->onDataSent.connect(boost::bind(&UserRegistryTest::handleDataReceived, this, _1, client2));
 			loop->processEvents();
+		}
 		void tearDown (void) {
 			delete server;
-			dynamic_cast<Swift::DummyConnection *>(client1.get())->onDataSent.disconnect_all_slots();
+			SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast<Swift::DummyConnection>(client1)->onDataSent.disconnect_all_slots();
 			client1.reset();
-			dynamic_cast<Swift::DummyConnection *>(client2.get())->onDataSent.disconnect_all_slots();
+			SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast<Swift::DummyConnection>(client2)->onDataSent.disconnect_all_slots();
 			client2.reset();
 			connectionServer.reset();
 			delete userRegistry;
 			delete factories;
 			delete loop;
 			delete cfg;
 			received1.clear();
 			received2.clear();
+		}
 		void send(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Connection> conn, const std::string &data) {
-			dynamic_cast<Swift::DummyConnection *>(conn.get())->receive(Swift::createSafeByteArray(data));
+			SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast<Swift::DummyConnection>(conn)->receive(Swift::createSafeByteArray(data));
 			loop->processEvents();
+		}
 		void sendCredentials(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Connection> conn, const std::string &username, const std::string &password, const std::string &b64) {
 			std::vector<std::string> &received = conn == client1 ? received1 : received2;
 			send(conn, "<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' to='localhost' version='1.0'>");
 			CPPUNIT_ASSERT_EQUAL(2, (int) received.size());
 			CPPUNIT_ASSERT(received[0].find("<?xml version=\"1.0\"?>") == 0);
 			CPPUNIT_ASSERT(received[1].find("PLAIN") != std::string::npos);
 			received.clear();
 			// username:test
 			send(conn, "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>" + b64 + "</auth>");
 			if (conn == client1)
 				CPPUNIT_ASSERT_EQUAL(Connecting, state1);
 // 			else
 // 				CPPUNIT_ASSERT_EQUAL(Connecting, state2);
 			CPPUNIT_ASSERT_EQUAL(password, userRegistry->getUserPassword(username));
 			CPPUNIT_ASSERT_EQUAL(std::string(""), userRegistry->getUserPassword("unknown@localhost"));
+		}
 		void bindSession(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Connection> conn) {
 			std::vector<std::string> &received = conn == client1 ? received1 : received2;

0 comments (0 inline, 0 general)