mirrors/aria2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2009-04-25 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Browse Source 
Removed ExtendedMessagingAware. Instead of using inheritance,
	added ExtensionMessageRegistry and it is passed to
	DefaultExtensionMessageFactory.
	* src/DefaultBtInteractive.cc
	* src/DefaultBtInteractive.h
	* src/DefaultExtensionMessageFactory.cc
	* src/DefaultExtensionMessageFactory.h
	* src/ExtendedMessagingAware.h: Removed.
	* src/ExtensionMessageFactory.h
	* src/ExtensionMessageRegistry.h: Added.
	* src/Makefile.am
	* src/PeerInteractionCommand.cc
	* test/DefaultExtensionMessageFactoryTest.cc
This commit is contained in:
Tatsuhiro Tsujikawa
2009-04-25 10:48:00 +00:00
parent 3908d86213
commit e385c68f52
11 changed files with 86 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/DefaultExtensionMessageFactoryTest.cc
View File

@@ -12,6 +12,7 @@
#include "UTPexExtensionMessage.h"
#include "Exception.h"
#include "FileEntry.h"
#include "ExtensionMessageRegistry.h"
namespace aria2 {
@@ -27,6 +28,7 @@ private:
SharedHandle<MockPeerStorage> _peerStorage;
SharedHandle<Peer> _peer;
SharedHandle<DefaultExtensionMessageFactory> _factory;
SharedHandle<ExtensionMessageRegistry> _registry;
public:
void setUp()
{
@@ -41,10 +43,13 @@ public:
_peer->allocateSessionResource(1024, 1024*1024);
_peer->setExtension("ut_pex", 1);
_registry.reset(new ExtensionMessageRegistry());
_factory.reset(new DefaultExtensionMessageFactory());
_factory->setBtContext(_btContext);
_factory->setPeerStorage(_peerStorage);
_factory->setPeer(_peer);
_factory->setExtensionMessageRegistry(_registry);
}
void testCreateMessage_unknown();
@@ -95,7 +100,7 @@ void DefaultExtensionMessageFactoryTest::testCreateMessage_UTPex()
PeerMessageUtil::createcompact(c3, "192.168.0.2", 6882);
PeerMessageUtil::createcompact(c4, "10.1.1.3",10000);
char id[1] = { _factory->getExtensionMessageID("ut_pex") };
char id[1] = { _registry->getExtensionMessageID("ut_pex") };
std::string data = std::string(&id[0], &id[1])+"d5:added12:"+
std::string(&c1[0], &c1[6])+std::string(&c2[0], &c2[6])+
@@ -107,7 +112,7 @@ void DefaultExtensionMessageFactoryTest::testCreateMessage_UTPex()
(dynamic_pointer_cast<UTPexExtensionMessage>
(_factory->createMessage
(reinterpret_cast<const unsigned char*>(data.c_str()), data.size())));
CPPUNIT_ASSERT_EQUAL(_factory->getExtensionMessageID("ut_pex"),
CPPUNIT_ASSERT_EQUAL(_registry->getExtensionMessageID("ut_pex"),
m->getExtensionMessageID());
}