diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-03-26 17:12:52 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-03-26 17:20:27 +0900 |
| commit | d64089632e82a2548752c7a6baaa68365a795a74 (patch) | |
| tree | 57fc7b85a8c1290975d58fa4761b04a7695bf7e3 /test/DHTFindNodeReplyMessageTest.cc | |
| parent | c81b1321122e8509b55c94c0cbca0d8d6d319f0c (diff) | |
| parent | a7cd943a06b1a5ff4515b57060b84037f8d01f9f (diff) | |
Merge branch 'master' into random-webseeding
Diffstat (limited to 'test/DHTFindNodeReplyMessageTest.cc')
| -rw-r--r-- | test/DHTFindNodeReplyMessageTest.cc | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/test/DHTFindNodeReplyMessageTest.cc b/test/DHTFindNodeReplyMessageTest.cc index a69f4b13..599f6dfe 100644 --- a/test/DHTFindNodeReplyMessageTest.cc +++ b/test/DHTFindNodeReplyMessageTest.cc @@ -11,12 +11,13 @@ namespace aria2 { -class DHTFindNodeReplyMessageTest:public CppUnit::TestFixture { +class DHTFindNodeReplyMessageTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(DHTFindNodeReplyMessageTest); CPPUNIT_TEST(testGetBencodedMessage); CPPUNIT_TEST(testGetBencodedMessage6); CPPUNIT_TEST_SUITE_END(); + public: void setUp() {} @@ -27,7 +28,6 @@ public: void testGetBencodedMessage6(); }; - CPPUNIT_TEST_SUITE_REGISTRATION(DHTFindNodeReplyMessageTest); void DHTFindNodeReplyMessageTest::testGetBencodedMessage() @@ -43,20 +43,21 @@ void DHTFindNodeReplyMessageTest::testGetBencodedMessage() msg.setVersion("A200"); std::string compactNodeInfo; std::shared_ptr<DHTNode> nodes[8]; - for(size_t i = 0; i < DHTBucket::K; ++i) { + for (size_t i = 0; i < DHTBucket::K; ++i) { nodes[i].reset(new DHTNode()); - nodes[i]->setIPAddress("192.168.0."+util::uitos(i+1)); - nodes[i]->setPort(6881+i); + nodes[i]->setIPAddress("192.168.0." + util::uitos(i + 1)); + nodes[i]->setPort(6881 + i); unsigned char buf[COMPACT_LEN_IPV6]; - CPPUNIT_ASSERT_EQUAL(COMPACT_LEN_IPV4, bittorrent::packcompact - (buf, nodes[i]->getIPAddress(), nodes[i]->getPort())); + CPPUNIT_ASSERT_EQUAL(COMPACT_LEN_IPV4, + bittorrent::packcompact(buf, nodes[i]->getIPAddress(), + nodes[i]->getPort())); compactNodeInfo += - std::string(&nodes[i]->getID()[0], &nodes[i]->getID()[DHT_ID_LENGTH])+ - std::string(&buf[0], &buf[COMPACT_LEN_IPV4]); + std::string(&nodes[i]->getID()[0], &nodes[i]->getID()[DHT_ID_LENGTH]) + + std::string(&buf[0], &buf[COMPACT_LEN_IPV4]); } - msg.setClosestKNodes - (std::vector<std::shared_ptr<DHTNode> >(&nodes[0], &nodes[DHTBucket::K])); + msg.setClosestKNodes( + std::vector<std::shared_ptr<DHTNode>>(&nodes[0], &nodes[DHTBucket::K])); std::string msgbody = msg.getBencodedMessage(); @@ -85,20 +86,21 @@ void DHTFindNodeReplyMessageTest::testGetBencodedMessage6() msg.setVersion("A200"); std::string compactNodeInfo; std::shared_ptr<DHTNode> nodes[8]; - for(size_t i = 0; i < DHTBucket::K; ++i) { + for (size_t i = 0; i < DHTBucket::K; ++i) { nodes[i].reset(new DHTNode()); - nodes[i]->setIPAddress("2001::000"+util::uitos(i+1)); - nodes[i]->setPort(6881+i); + nodes[i]->setIPAddress("2001::000" + util::uitos(i + 1)); + nodes[i]->setPort(6881 + i); unsigned char buf[COMPACT_LEN_IPV6]; - CPPUNIT_ASSERT_EQUAL(COMPACT_LEN_IPV6, bittorrent::packcompact - (buf, nodes[i]->getIPAddress(), nodes[i]->getPort())); + CPPUNIT_ASSERT_EQUAL(COMPACT_LEN_IPV6, + bittorrent::packcompact(buf, nodes[i]->getIPAddress(), + nodes[i]->getPort())); compactNodeInfo += - std::string(&nodes[i]->getID()[0], &nodes[i]->getID()[DHT_ID_LENGTH])+ - std::string(&buf[0], &buf[COMPACT_LEN_IPV6]); + std::string(&nodes[i]->getID()[0], &nodes[i]->getID()[DHT_ID_LENGTH]) + + std::string(&buf[0], &buf[COMPACT_LEN_IPV6]); } - msg.setClosestKNodes - (std::vector<std::shared_ptr<DHTNode> >(&nodes[0], &nodes[DHTBucket::K])); + msg.setClosestKNodes( + std::vector<std::shared_ptr<DHTNode>>(&nodes[0], &nodes[DHTBucket::K])); std::string msgbody = msg.getBencodedMessage(); |