summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2008-11-03 12:06:39 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2008-11-03 12:06:39 +0000
commit0b7033abb7ebf7a82b699d03cbb6f5f1566346b6 (patch)
tree95ea257febeffa2d486a97bd8be9b23cf45a90c7
parent6d01f8f94ff83241fbae5130d1904e03a08945aa (diff)
2008-11-03 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Added testcase for BtNotInterestedMessage from unchoked peer. * test/BtNotInterestedMessageTest.cc
-rw-r--r--ChangeLog5
-rw-r--r--test/BtNotInterestedMessageTest.cc18
2 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d7301ea8..d7a06f67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-11-03 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
+ Added testcase for BtNotInterestedMessage from unchoked peer.
+ * test/BtNotInterestedMessageTest.cc
+
+2008-11-03 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
+
Execute choking algorithm when BtInterestedMessage arrives from
unchoked peer.
* src/BtInterestedMessage.cc
diff --git a/test/BtNotInterestedMessageTest.cc b/test/BtNotInterestedMessageTest.cc
index d57d8d89..b23c0fec 100644
--- a/test/BtNotInterestedMessageTest.cc
+++ b/test/BtNotInterestedMessageTest.cc
@@ -6,7 +6,7 @@
#include "PeerMessageUtil.h"
#include "Peer.h"
-#include "PeerStorage.h"
+#include "MockPeerStorage.h"
namespace aria2 {
@@ -19,13 +19,7 @@ class BtNotInterestedMessageTest:public CppUnit::TestFixture {
CPPUNIT_TEST(testOnSendComplete);
CPPUNIT_TEST(testToString);
CPPUNIT_TEST_SUITE_END();
-private:
-
public:
- void setUp() {
- // TODO add peer storage here
- }
-
void testCreate();
void testGetMessage();
void testDoReceivedAction();
@@ -71,11 +65,21 @@ void BtNotInterestedMessageTest::testDoReceivedAction() {
SharedHandle<Peer> peer(new Peer("host", 6969));
peer->allocateSessionResource(1024, 1024*1024);
peer->peerInterested(true);
+
+ SharedHandle<MockPeerStorage> peerStorage(new MockPeerStorage());
+
BtNotInterestedMessage msg;
msg.setPeer(peer);
+ msg.setPeerStorage(peerStorage);
+
CPPUNIT_ASSERT(peer->peerInterested());
msg.doReceivedAction();
CPPUNIT_ASSERT(!peer->peerInterested());
+ CPPUNIT_ASSERT_EQUAL(0, peerStorage->getNumChokeExecuted());
+
+ peer->amChoking(false);
+ msg.doReceivedAction();
+ CPPUNIT_ASSERT_EQUAL(1, peerStorage->getNumChokeExecuted());
}
void BtNotInterestedMessageTest::testOnSendComplete() {