diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-12-25 12:34:23 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-12-25 12:34:23 +0000 |
| commit | f5b68379d5a8fa8737bf5a7a9d654a32477a85e2 (patch) | |
| tree | 8bbd666567e2f278e8568815fd0f5e9df8370d67 /test/HandshakeExtensionMessageTest.cc | |
| parent | 7ff1f5a62053a45a531f5453d513314d78859ed3 (diff) | |
2007-12-25 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Removed incomingPeer. Set 0 to peer's port if it is not a listening
port.
* src/DefaultPeerStorage.{h, cc}
* test/DefaultPeerStorageTest.cc
* src/HandshakeExtensionMessage.cc
* test/HandshakeExtensionMessageTest.cc
* src/Peer.{h, cc}: Added ipaddr and port to identity comparison.
* src/PeerStorage.h
* test/MockPeerStorage.h
* src/PeerListenCommand.cc
Diffstat (limited to 'test/HandshakeExtensionMessageTest.cc')
| -rw-r--r-- | test/HandshakeExtensionMessageTest.cc | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/test/HandshakeExtensionMessageTest.cc b/test/HandshakeExtensionMessageTest.cc index 6cecd611..37d43b39 100644 --- a/test/HandshakeExtensionMessageTest.cc +++ b/test/HandshakeExtensionMessageTest.cc @@ -1,8 +1,7 @@ #include "HandshakeExtensionMessage.h" #include "Peer.h" #include "MockBtContext.h" -#include "MockPeerStorage.h" -#include "BtRegistry.h" +#include "Exception.h" #include <cppunit/extensions/HelperMacros.h> class HandshakeExtensionMessageTest:public CppUnit::TestFixture { @@ -21,23 +20,9 @@ private: public: HandshakeExtensionMessageTest():_btContext(0) {} - void setUp() - { - BtRegistry::unregisterAll(); - MockBtContextHandle btContext = new MockBtContext(); - unsigned char infohash[20]; - memset(infohash, 0, sizeof(infohash)); - btContext->setInfoHash(infohash); - _btContext = btContext; - MockPeerStorageHandle peerStorage = new MockPeerStorage(); - BtRegistry::registerPeerStorage(_btContext->getInfoHashAsString(), - peerStorage); - } + void setUp() {} - void tearDown() - { - BtRegistry::unregisterAll(); - } + void tearDown() {} void testGetExtensionMessageID(); void testGetExtensionName(); @@ -99,11 +84,6 @@ void HandshakeExtensionMessageTest::testDoReceivedAction() CPPUNIT_ASSERT_EQUAL((uint16_t)6889, peer->port); CPPUNIT_ASSERT_EQUAL((uint8_t)1, peer->getExtensionMessageID("ut_pex")); CPPUNIT_ASSERT_EQUAL((uint8_t)2, peer->getExtensionMessageID("a2_dht")); - - CPPUNIT_ASSERT_EQUAL((size_t)1, PEER_STORAGE(_btContext)->getPeers().size()); - PeerHandle p1 = PEER_STORAGE(_btContext)->getPeers().front(); - CPPUNIT_ASSERT_EQUAL(string("192.168.0.1"), p1->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6889, p1->port); } void HandshakeExtensionMessageTest::testCreate() |