summaryrefslogtreecommitdiff
path: root/test/BtRequestMessageTest.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2010-03-04 16:24:03 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2010-03-04 16:24:03 +0000
commit8b73c2843f659fe6cafd94534481e371888f0b5e (patch)
treea228c40972e5a2053ef2837b8df7687019f99d9f /test/BtRequestMessageTest.cc
parent5d05ef0e756a7c52673fcf78b4ab8c9ccee2154d (diff)
2010-03-05 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Reduced copying/std::string instantiation in sending/receiving BitTorrent messages. * src/BtBitfieldMessage.cc * src/BtBitfieldMessage.h * src/BtExtendedMessage.cc * src/BtExtendedMessage.h * src/BtHandshakeMessage.cc * src/BtHandshakeMessage.h * src/BtKeepAliveMessage.cc * src/BtKeepAliveMessage.h * src/BtPieceMessage.cc * src/BtPieceMessage.h * src/BtPortMessage.cc * src/BtPortMessage.h * src/BtUnchokeMessage.h * src/DefaultBtMessageReceiver.cc * src/IndexBtMessage.cc * src/IndexBtMessage.h * src/PeerConnection.cc * src/PeerConnection.h * src/RangeBtMessage.cc * src/RangeBtMessage.h * src/SimpleBtMessage.cc * src/SimpleBtMessage.h * src/SocketBuffer.cc * src/SocketBuffer.h * src/ZeroBtMessage.cc * src/ZeroBtMessage.h * test/BtAllowedFastMessageTest.cc * test/BtBitfieldMessageTest.cc * test/BtCancelMessageTest.cc * test/BtChokeMessageTest.cc * test/BtExtendedMessageTest.cc * test/BtHandshakeMessageTest.cc * test/BtHaveAllMessageTest.cc * test/BtHaveMessageTest.cc * test/BtHaveNoneMessageTest.cc * test/BtInterestedMessageTest.cc * test/BtKeepAliveMessageTest.cc * test/BtNotInterestedMessageTest.cc * test/BtPieceMessageTest.cc * test/BtPortMessageTest.cc * test/BtRejectMessageTest.cc * test/BtRequestMessageTest.cc * test/BtSuggestPieceMessageTest.cc * test/BtUnchokeMessageTest.cc
Diffstat (limited to 'test/BtRequestMessageTest.cc')
-rw-r--r--test/BtRequestMessageTest.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/test/BtRequestMessageTest.cc b/test/BtRequestMessageTest.cc
index 62dd95bd..13a69784 100644
--- a/test/BtRequestMessageTest.cc
+++ b/test/BtRequestMessageTest.cc
@@ -22,7 +22,7 @@ class BtRequestMessageTest:public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(BtRequestMessageTest);
CPPUNIT_TEST(testCreate);
- CPPUNIT_TEST(testGetMessage);
+ CPPUNIT_TEST(testCreateMessage);
CPPUNIT_TEST(testDoReceivedAction_hasPieceAndAmNotChoking);
CPPUNIT_TEST(testDoReceivedAction_hasPieceAndAmChokingAndFastExtensionEnabled);
CPPUNIT_TEST(testDoReceivedAction_hasPieceAndAmChokingAndFastExtensionDisabled);
@@ -40,7 +40,7 @@ private:
public:
void testCreate();
- void testGetMessage();
+ void testCreateMessage();
void testDoReceivedAction_hasPieceAndAmNotChoking();
void testDoReceivedAction_hasPieceAndAmChokingAndFastExtensionEnabled();
void testDoReceivedAction_hasPieceAndAmChokingAndFastExtensionDisabled();
@@ -156,7 +156,7 @@ void BtRequestMessageTest::testCreate() {
}
}
-void BtRequestMessageTest::testGetMessage() {
+void BtRequestMessageTest::testCreateMessage() {
BtRequestMessage msg;
msg.setIndex(12345);
msg.setBegin(256);
@@ -166,7 +166,9 @@ void BtRequestMessageTest::testGetMessage() {
bittorrent::setIntParam(&data[5], 12345);
bittorrent::setIntParam(&data[9], 256);
bittorrent::setIntParam(&data[13], 1024);
- CPPUNIT_ASSERT(memcmp(msg.getMessage(), data, 17) == 0);
+ unsigned char* rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT(memcmp(rawmsg, data, 17) == 0);
+ delete [] rawmsg;
}
void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmNotChoking() {