From cb4e25e4b4a2cfa6349a25586a44c932022e6841 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 19 Jun 2010 17:54:54 +0000 Subject: 2010-06-20 Tatsuhiro Tsujikawa Removed BDE and bencode --- test/DHTFindNodeMessageTest.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'test/DHTFindNodeMessageTest.cc') diff --git a/test/DHTFindNodeMessageTest.cc b/test/DHTFindNodeMessageTest.cc index 0fd9214d..9a049c2d 100644 --- a/test/DHTFindNodeMessageTest.cc +++ b/test/DHTFindNodeMessageTest.cc @@ -9,7 +9,7 @@ #include "MockDHTMessage.h" #include "MockDHTMessageDispatcher.h" #include "DHTRoutingTable.h" -#include "bencode.h" +#include "bencode2.h" namespace aria2 { @@ -62,17 +62,17 @@ void DHTFindNodeMessageTest::testGetBencodedMessage() msg.setVersion("A200"); std::string msgbody = msg.getBencodedMessage(); - BDE dict = BDE::dict(); - dict["t"] = transactionID; - dict["v"] = BDE("A200"); - dict["y"] = BDE("q"); - dict["q"] = BDE("find_node"); - BDE aDict = BDE::dict(); - aDict["id"] = BDE(localNode->getID(), DHT_ID_LENGTH); - aDict["target"] = BDE(targetNode->getID(), DHT_ID_LENGTH); - dict["a"] = aDict; - - CPPUNIT_ASSERT_EQUAL(bencode::encode(dict), msgbody); + Dict dict; + dict.put("t", transactionID); + dict.put("v", "A200"); + dict.put("y", "q"); + dict.put("q", "find_node"); + SharedHandle aDict = Dict::g(); + aDict->put("id", String::g(localNode->getID(), DHT_ID_LENGTH)); + aDict->put("target", String::g(targetNode->getID(), DHT_ID_LENGTH)); + dict.put("a", aDict); + + CPPUNIT_ASSERT_EQUAL(bencode2::encode(&dict), msgbody); } void DHTFindNodeMessageTest::testDoReceivedAction() -- cgit