diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-10-31 11:54:54 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-10-31 11:54:54 +0000 |
| commit | 20c8ce4128bb226d252159e135f8e0d3d0387bee (patch) | |
| tree | f35c632cef4a94f433cc1f8e2bddfe64ad7598ed /test/DHTPeerAnnounceEntryTest.cc | |
| parent | 0dcb41da49c41f0f76bb538b93796a4d0dda2146 (diff) | |
2009-10-31 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed peerStorage from DHTPeerAnnounceEntry. It is unlikely to
receive get_peers request for torrent which the client is now
downloading.
* src/BtSetup.cc
* src/DHTPeerAnnounceEntry.cc
* src/DHTPeerAnnounceEntry.h
* src/DHTPeerAnnounceStorage.cc
* src/DHTPeerAnnounceStorage.h
* src/RequestGroup.cc
* test/DHTPeerAnnounceEntryTest.cc
* test/DHTPeerAnnounceStorageTest.cc
Diffstat (limited to 'test/DHTPeerAnnounceEntryTest.cc')
| -rw-r--r-- | test/DHTPeerAnnounceEntryTest.cc | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/test/DHTPeerAnnounceEntryTest.cc b/test/DHTPeerAnnounceEntryTest.cc index cc79afce..a7cc91af 100644 --- a/test/DHTPeerAnnounceEntryTest.cc +++ b/test/DHTPeerAnnounceEntryTest.cc @@ -6,8 +6,8 @@ #include "Exception.h" #include "util.h" -#include "MockPeerStorage.h" #include "FileEntry.h" +#include "Peer.h" namespace aria2 { @@ -61,11 +61,6 @@ void DHTPeerAnnounceEntryTest::testEmpty() } { DHTPeerAnnounceEntry entry(infohash); - entry.setPeerStorage(SharedHandle<PeerStorage>(new MockPeerStorage())); - CPPUNIT_ASSERT(!entry.empty()); - } - { - DHTPeerAnnounceEntry entry(infohash); CPPUNIT_ASSERT(entry.empty()); } } @@ -92,16 +87,6 @@ void DHTPeerAnnounceEntryTest::testGetPeers() unsigned char infohash[DHT_ID_LENGTH]; memset(infohash, 0xff, DHT_ID_LENGTH); - SharedHandle<MockPeerStorage> peerStorage(new MockPeerStorage()); - { - SharedHandle<Peer> activePeers[2]; - activePeers[0].reset(new Peer("192.168.0.3", 6883)); - activePeers[1].reset(new Peer("192.168.0.4", 6884)); - - peerStorage->setActivePeers(std::deque<SharedHandle<Peer> >(&activePeers[0], - &activePeers[2])); - } - DHTPeerAnnounceEntry entry(infohash); { std::deque<SharedHandle<Peer> > peers; @@ -121,20 +106,6 @@ void DHTPeerAnnounceEntryTest::testGetPeers() CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), peers[1]->ipaddr); CPPUNIT_ASSERT_EQUAL((uint16_t)6882, peers[1]->port); } - entry.setPeerStorage(peerStorage); - { - std::deque<SharedHandle<Peer> > peers; - entry.getPeers(peers); - CPPUNIT_ASSERT_EQUAL((size_t)4, peers.size()); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peers[0]->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6881, peers[0]->port); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), peers[1]->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6882, peers[1]->port); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.3"), peers[2]->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6883, peers[2]->port); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.4"), peers[3]->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6884, peers[3]->port); - } } } // namespace aria2 |