1 files changed, 12 insertions, 15 deletions
diff --git a/test/DHTFindNodeReplyMessageTest.cc b/test/DHTFindNodeReplyMessageTest.cc
index cab09ad1..d4f3290e 100644
--- a/test/DHTFindNodeReplyMessageTest.cc
+++ b/test/DHTFindNodeReplyMessageTest.cc
@@ -1,14 +1,14 @@
 #include "DHTFindNodeReplyMessage.h"
+
+#include <cppunit/extensions/HelperMacros.h>
+
 #include "DHTNode.h"
 #include "DHTUtil.h"
-#include "BencodeVisitor.h"
-#include "Dictionary.h"
-#include "Data.h"
 #include "Exception.h"
 #include "Util.h"
 #include "DHTBucket.h"
 #include "PeerMessageUtil.h"
-#include <cppunit/extensions/HelperMacros.h>
+#include "bencode.h"
 
 namespace aria2 {
 
@@ -56,18 +56,15 @@ void DHTFindNodeReplyMessageTest::testGetBencodedMessage()
 
   std::string msgbody = msg.getBencodedMessage();
 
-  SharedHandle<Dictionary> cm(new Dictionary());
-  cm->put("t", new Data(transactionID));
-  cm->put("y", new Data("r"));
-  Dictionary* r = new Dictionary();
-  cm->put("r", r);
-  r->put("id", new Data(localNode->getID(), DHT_ID_LENGTH));
-  r->put("nodes", new Data(compactNodeInfo));
-
-  BencodeVisitor v;
-  cm->accept(&v);
+  bencode::BDE dict = bencode::BDE::dict();
+  dict["t"] = transactionID;
+  dict["y"] = bencode::BDE("r");
+  bencode::BDE rDict = bencode::BDE::dict();
+  rDict["id"] = bencode::BDE(localNode->getID(), DHT_ID_LENGTH);
+  rDict["nodes"] = compactNodeInfo;
+  dict["r"] = rDict;
 
-  CPPUNIT_ASSERT_EQUAL(v.getBencodedData(), msgbody);
+  CPPUNIT_ASSERT_EQUAL(bencode::encode(dict), msgbody);
 }
 
 } // namespace aria2