diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-12-14 05:46:45 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-12-14 05:46:45 +0000 |
| commit | 9202fe23c8113cd02c77a2b1132372b1d0601190 (patch) | |
| tree | 322fd603b573504fb4a2d472705887a33074b4da /test/DHTMessageTrackerTest.cc | |
| parent | 057132cd5f03294433648c5f794b43c57fd62375 (diff) | |
2008-12-14 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Use BDE instead of Dictionary/List/Data.
* src/DHTAbstractMessage.cc
* src/DHTAbstractMessage.h
* src/DHTAnnouncePeerMessage.cc
* src/DHTAnnouncePeerMessage.h
* src/DHTAnnouncePeerReplyMessage.cc
* src/DHTAnnouncePeerReplyMessage.h
* src/DHTFindNodeMessage.cc
* src/DHTFindNodeMessage.h
* src/DHTFindNodeReplyMessage.cc
* src/DHTFindNodeReplyMessage.h
* src/DHTGetPeersMessage.cc
* src/DHTGetPeersMessage.h
* src/DHTGetPeersReplyMessage.cc
* src/DHTGetPeersReplyMessage.h
* src/DHTMessageFactory.h
* src/DHTMessageFactoryImpl.cc
* src/DHTMessageFactoryImpl.h
* src/DHTMessageReceiver.cc
* src/DHTMessageTracker.cc
* src/DHTMessageTracker.h
* src/DHTPingMessage.cc
* src/DHTPingMessage.h
* src/DHTPingReplyMessage.cc
* src/DHTPingReplyMessage.h
* src/DHTQueryMessage.cc
* src/DHTQueryMessage.h
* src/DHTResponseMessage.cc
* src/DHTResponseMessage.h
* test/DHTAnnouncePeerMessageTest.cc
* test/DHTAnnouncePeerReplyMessageTest.cc
* test/DHTFindNodeMessageTest.cc
* test/DHTFindNodeReplyMessageTest.cc
* test/DHTGetPeersMessageTest.cc
* test/DHTGetPeersReplyMessageTest.cc
* test/DHTMessageFactoryImplTest.cc
* test/DHTMessageTrackerTest.cc
* test/DHTPingMessageTest.cc
* test/DHTPingReplyMessageTest.cc
* test/MockDHTMessageFactory.h
Diffstat (limited to 'test/DHTMessageTrackerTest.cc')
| -rw-r--r-- | test/DHTMessageTrackerTest.cc | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/test/DHTMessageTrackerTest.cc b/test/DHTMessageTrackerTest.cc index 9a0a144a..5866a8bd 100644 --- a/test/DHTMessageTrackerTest.cc +++ b/test/DHTMessageTrackerTest.cc @@ -1,16 +1,16 @@ #include "DHTMessageTracker.h" + +#include <cppunit/extensions/HelperMacros.h> + #include "Exception.h" #include "Util.h" #include "MockDHTMessage.h" #include "MockDHTMessageCallback.h" #include "DHTNode.h" -#include "MetaEntry.h" #include "DHTMessageTrackerEntry.h" #include "DHTRoutingTable.h" #include "MockDHTMessageFactory.h" -#include "Dictionary.h" -#include "Data.h" -#include <cppunit/extensions/HelperMacros.h> +#include "bencode.h" namespace aria2 { @@ -76,11 +76,12 @@ void DHTMessageTrackerTest::testMessageArrived() tracker.addMessage(m3); { - SharedHandle<Dictionary> res(new Dictionary()); - res->put("t", new Data(m2->getTransactionID())); + bencode::BDE resDict = bencode::BDE::dict(); + resDict["t"] = m2->getTransactionID(); std::pair<SharedHandle<DHTMessage>, SharedHandle<DHTMessageCallback> > p = - tracker.messageArrived(res.get(), m2->getRemoteNode()->getIPAddress(), m2->getRemoteNode()->getPort()); + tracker.messageArrived(resDict, m2->getRemoteNode()->getIPAddress(), + m2->getRemoteNode()->getPort()); SharedHandle<DHTMessage> reply = p.first; CPPUNIT_ASSERT(!reply.isNull()); @@ -89,10 +90,12 @@ void DHTMessageTrackerTest::testMessageArrived() CPPUNIT_ASSERT_EQUAL((size_t)2, tracker.countEntry()); } { - SharedHandle<Dictionary> res(new Dictionary()); - res->put("t", new Data(m3->getTransactionID())); + bencode::BDE resDict = bencode::BDE::dict(); + resDict["t"] = m3->getTransactionID(); - std::pair<SharedHandle<DHTMessage>, SharedHandle<DHTMessageCallback> > p = tracker.messageArrived(res.get(), m3->getRemoteNode()->getIPAddress(), m3->getRemoteNode()->getPort()); + std::pair<SharedHandle<DHTMessage>, SharedHandle<DHTMessageCallback> > p = + tracker.messageArrived(resDict, m3->getRemoteNode()->getIPAddress(), + m3->getRemoteNode()->getPort()); SharedHandle<DHTMessage> reply = p.first; CPPUNIT_ASSERT(!reply.isNull()); @@ -100,10 +103,11 @@ void DHTMessageTrackerTest::testMessageArrived() CPPUNIT_ASSERT_EQUAL((size_t)1, tracker.countEntry()); } { - SharedHandle<Dictionary> res(new Dictionary()); - res->put("t", new Data(m1->getTransactionID())); + bencode::BDE resDict = bencode::BDE::dict(); + resDict["t"] = m1->getTransactionID(); - std::pair<SharedHandle<DHTMessage>, SharedHandle<DHTMessageCallback> > p = tracker.messageArrived(res.get(), "192.168.1.100", 6889); + std::pair<SharedHandle<DHTMessage>, SharedHandle<DHTMessageCallback> > p = + tracker.messageArrived(resDict, "192.168.1.100", 6889); SharedHandle<DHTMessage> reply = p.first; CPPUNIT_ASSERT(reply.isNull()); |