From 3dfbec0f9ff13c660252d20dce17c88041280019 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 13 Jun 2010 11:25:21 +0000 Subject: 2010-06-13 Tatsuhiro Tsujikawa Rewritten DHTMessageCallback using Visitor pattern. Eliminated dynamic_pointer_cast. * src/DHTMessageCallbackImpl.cc: Removed * src/DHTMessageReceiver.cc * src/DHTAbstractNodeLookupTask.h * src/DHTAnnouncePeerReplyMessage.h * src/DHTReplaceNodeTask.h * src/DHTFindNodeReplyMessage.cc * src/DHTGetPeersReplyMessage.h * src/DHTPeerLookupTask.h * src/DHTMessageCallbackImpl.h: Removed * src/DHTMessageFactory.h * src/DHTNodeLookupTaskCallback.h * src/DHTMessageTracker.h * src/DHTMessageCallbackListener.h: Removed * src/DHTGetPeersReplyMessage.cc * src/DHTMessageCallback.h * src/DHTAnnouncePeerReplyMessage.cc * src/DHTNodeLookupTask.h * src/DHTReplaceNodeTask.cc * src/DHTPeerLookupTaskCallback.cc * src/DHTMessageTracker.cc * src/DHTPingReplyMessage.cc * src/DHTPingTask.cc * src/DHTMessageFactoryImpl.h * src/Makefile.am * src/DHTNodeLookupTask.cc * src/DHTPeerLookupTaskCallback.h * src/DHTPeerLookupTask.cc * src/DHTMessageReceiver.h * src/DHTMessageFactoryImpl.cc * src/DHTResponseMessage.h * src/DHTFindNodeReplyMessage.h * src/DHTPingReplyMessageCallback.h * src/Makefile.in * src/DHTBucketRefreshTask.cc * src/DHTNodeLookupTaskCallback.cc * src/DHTPingTask.h * src/DHTPingReplyMessage.h * src/DHTAbstractNodeLookupTask.cc: Removed * test/DHTMessageTrackerTest.cc * test/DHTPingMessageTest.cc * test/DHTGetPeersMessageTest.cc * test/MockDHTMessage.h * test/MockDHTMessageFactory.h * test/DHTFindNodeMessageTest.cc * test/MockDHTMessageCallback.h * test/DHTAnnouncePeerMessageTest.cc --- test/DHTFindNodeMessageTest.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'test/DHTFindNodeMessageTest.cc') diff --git a/test/DHTFindNodeMessageTest.cc b/test/DHTFindNodeMessageTest.cc index 9686797b..0fd9214d 100644 --- a/test/DHTFindNodeMessageTest.cc +++ b/test/DHTFindNodeMessageTest.cc @@ -29,14 +29,15 @@ public: class MockDHTMessageFactory2:public MockDHTMessageFactory { public: - virtual SharedHandle + virtual SharedHandle createFindNodeReplyMessage (const SharedHandle& remoteNode, const std::vector >& closestKNodes, const std::string& transactionID) { - SharedHandle m - (new MockDHTMessage(_localNode, remoteNode, "find_node", transactionID)); + SharedHandle m + (new MockDHTResponseMessage + (_localNode, remoteNode, "find_node", transactionID)); m->_nodes = closestKNodes; return m; } @@ -99,8 +100,9 @@ void DHTFindNodeMessageTest::testDoReceivedAction() msg.doReceivedAction(); CPPUNIT_ASSERT_EQUAL((size_t)1, dispatcher._messageQueue.size()); - SharedHandle m - (dynamic_pointer_cast(dispatcher._messageQueue[0]._message)); + SharedHandle m + (dynamic_pointer_cast + (dispatcher._messageQueue[0]._message)); CPPUNIT_ASSERT(localNode == m->getLocalNode()); CPPUNIT_ASSERT(remoteNode == m->getRemoteNode()); CPPUNIT_ASSERT_EQUAL(std::string("find_node"), m->getMessageType()); -- cgit