BitMaster/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2026-04-02 10:55:00 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

2008-04-20 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

Browse Source 
Rewritten SharedHandle. Now copy constructor taking raw pointer 
has
	keyword explicit and SharedHandle's default constructor 
initializes
	its internal obj to null, old implementation initializes it 
using
	obj's default constructor.
	To assign null, write SharedHandle<T> x(...); x.reset();
	TODO: test/SharedHandleTest.cc needs more tests.
	* src/SharedHandle.h
This commit is contained in:
Tatsuhiro Tsujikawa
2008-04-20 00:50:22 +00:00
parent 99733a84e2
commit 3505201f33
262 changed files with 2106 additions and 1843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/DHTFindNodeMessageTest.cc
View File

@@ -35,8 +35,8 @@ public:
const std::deque<SharedHandle<DHTNode> >& closestKNodes,
const std::string& transactionID)
{
SharedHandle<MockDHTMessage> m =
new MockDHTMessage(_localNode, remoteNode, "find_node", transactionID);
SharedHandle<MockDHTMessage> m
(new MockDHTMessage(_localNode, remoteNode, "find_node", transactionID));
m->_nodes = closestKNodes;
return m;
}
@@ -48,20 +48,20 @@ CPPUNIT_TEST_SUITE_REGISTRATION(DHTFindNodeMessageTest);
void DHTFindNodeMessageTest::testGetBencodedMessage()
{
SharedHandle<DHTNode> localNode = new DHTNode();
SharedHandle<DHTNode> remoteNode = new DHTNode();
SharedHandle<DHTNode> localNode(new DHTNode());
SharedHandle<DHTNode> remoteNode(new DHTNode());
unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
SharedHandle<DHTNode> targetNode = new DHTNode();
SharedHandle<DHTNode> targetNode(new DHTNode());
DHTFindNodeMessage msg(localNode, remoteNode, targetNode->getID(), transactionID);
std::string msgbody = msg.getBencodedMessage();
SharedHandle<Dictionary> cm = new Dictionary();
SharedHandle<Dictionary> cm(new Dictionary());
cm->put("t", new Data(transactionID));
cm->put("y", new Data("q"));
cm->put("q", new Data("find_node"));
@@ -78,14 +78,14 @@ void DHTFindNodeMessageTest::testGetBencodedMessage()
void DHTFindNodeMessageTest::testDoReceivedAction()
{
SharedHandle<DHTNode> localNode = new DHTNode();
SharedHandle<DHTNode> remoteNode = new DHTNode();
SharedHandle<DHTNode> localNode(new DHTNode());
SharedHandle<DHTNode> remoteNode(new DHTNode());
unsigned char tid[DHT_TRANSACTION_ID_LENGTH];
DHTUtil::generateRandomData(tid, DHT_TRANSACTION_ID_LENGTH);
std::string transactionID(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]);
SharedHandle<DHTNode> targetNode = new DHTNode();
SharedHandle<DHTNode> targetNode(new DHTNode());
MockDHTMessageDispatcher dispatcher;
MockDHTMessageFactory2 factory;
@@ -94,14 +94,15 @@ void DHTFindNodeMessageTest::testDoReceivedAction()
routingTable.addNode(targetNode);
DHTFindNodeMessage msg(localNode, remoteNode, targetNode->getID(), transactionID);
msg.setMessageDispatcher(&dispatcher);
msg.setMessageFactory(&factory);
msg.setRoutingTable(&routingTable);
msg.setMessageDispatcher(WeakHandle<DHTMessageDispatcher>(&dispatcher));
msg.setMessageFactory(WeakHandle<DHTMessageFactory>(&factory));
msg.setRoutingTable(WeakHandle<DHTRoutingTable>(&routingTable));
msg.doReceivedAction();
CPPUNIT_ASSERT_EQUAL((size_t)1, dispatcher._messageQueue.size());
SharedHandle<MockDHTMessage> m = dispatcher._messageQueue[0]._message;
SharedHandle<MockDHTMessage> m
(dynamic_pointer_cast<MockDHTMessage>(dispatcher._messageQueue[0]._message));
CPPUNIT_ASSERT(localNode == m->getLocalNode());
CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(std::string("find_node"), m->getMessageType());