diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-12-10 14:25:42 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-12-10 14:25:42 +0000 |
| commit | a67ed743a22b78c441af2db49816aa7ccadb7fd0 (patch) | |
| tree | 4c11c4c63b6e5c43b0550b5124e21d58418a0ba4 /test/HandshakeExtensionMessageTest.cc | |
| parent | 8c1894720f4f05c40d251fe0e1c8663c2f7a0ddf (diff) | |
2008-12-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Use BDE instead of Dictionary/List/Data.
* src/HandshakeExtensionMessage.cc
* src/HandshakeExtensionMessage.h
* test/HandshakeExtensionMessageTest.cc
Diffstat (limited to 'test/HandshakeExtensionMessageTest.cc')
| -rw-r--r-- | test/HandshakeExtensionMessageTest.cc | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/test/HandshakeExtensionMessageTest.cc b/test/HandshakeExtensionMessageTest.cc index 898ca8cb..eb97efeb 100644 --- a/test/HandshakeExtensionMessageTest.cc +++ b/test/HandshakeExtensionMessageTest.cc @@ -1,10 +1,13 @@ #include "HandshakeExtensionMessage.h" + +#include <iostream> + +#include <cppunit/extensions/HelperMacros.h> + #include "Peer.h" #include "MockBtContext.h" #include "Exception.h" #include "FileEntry.h" -#include <iostream> -#include <cppunit/extensions/HelperMacros.h> namespace aria2 { @@ -57,7 +60,11 @@ void HandshakeExtensionMessageTest::testGetBencodedData() msg.setTCPPort(6889); msg.setExtension("ut_pex", 1); msg.setExtension("a2_dht", 2); - CPPUNIT_ASSERT_EQUAL(std::string("d1:v5:aria21:pi6889e1:md6:a2_dhti2e6:ut_pexi1eee"), msg.getBencodedData()); + CPPUNIT_ASSERT_EQUAL(std::string("d" + "1:md6:a2_dhti2e6:ut_pexi1ee" + "1:pi6889e" + "1:v5:aria2" + "e"), msg.getBencodedData()); } void HandshakeExtensionMessageTest::testToString() @@ -132,11 +139,14 @@ void HandshakeExtensionMessageTest::testCreate_stringnum() { std::string in = "0d1:p4:68811:v5:aria21:md6:ut_pex1:1ee"; SharedHandle<HandshakeExtensionMessage> m = - HandshakeExtensionMessage::create(reinterpret_cast<const unsigned char*>(in.c_str()), + HandshakeExtensionMessage::create + (reinterpret_cast<const unsigned char*>(in.c_str()), in.size()); CPPUNIT_ASSERT_EQUAL(std::string("aria2"), m->getClientVersion()); - CPPUNIT_ASSERT_EQUAL((uint16_t)6881, m->getTCPPort()); - CPPUNIT_ASSERT_EQUAL((uint8_t)1, m->getExtensionMessageID("ut_pex")); + // port number in string is not allowed + CPPUNIT_ASSERT_EQUAL((uint16_t)0, m->getTCPPort()); + // extension ID in string is not allowed + CPPUNIT_ASSERT_EQUAL((uint8_t)0, m->getExtensionMessageID("ut_pex")); } } // namespace aria2 |