github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2008-07-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Added the test for the previous change in DefaultBtContext.cc
	* test/DefaultBtContextTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2008-07-12 07:41:15 +00:00
parent 8929168380
commit cefbf6407e
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-07-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Added the test for the previous change in DefaultBtContext.cc
* test/DefaultBtContextTest.cc
2008-07-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2008-07-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Fixed the bug that causes infinite loop when the number of pieces are Fixed the bug that causes infinite loop when the number of pieces are

27
test/DefaultBtContextTest.cc
View File

@ -4,6 +4,7 @@
#include "AnnounceTier.h" #include "AnnounceTier.h"
#include "FixedNumberRandomizer.h" #include "FixedNumberRandomizer.h"
#include "FileEntry.h" #include "FileEntry.h"
#include "array_fun.h"
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
@ -234,29 +235,35 @@ void DefaultBtContextTest::testComputeFastSet()
memset(infoHash, 0, sizeof(infoHash)); memset(infoHash, 0, sizeof(infoHash));
infoHash[0] = 0xff; infoHash[0] = 0xff;
int pieces = 1000;
int fastSetSize = 10; int fastSetSize = 10;
DefaultBtContext btContext; DefaultBtContext btContext;
btContext.setInfoHash(infoHash); btContext.setInfoHash(infoHash);
btContext.setNumPieces(pieces); btContext.setNumPieces(1000);
{ {
std::deque<size_t> fastSet; std::deque<size_t> fastSet;
btContext.computeFastSet(fastSet, ipaddr, fastSetSize); btContext.computeFastSet(fastSet, ipaddr, fastSetSize);
//for_each(fastSet.begin(), fastSet.end(), Printer()); size_t ans[] = { 686, 459, 278, 200, 404, 834, 64, 203, 760, 950 };
//cerr << endl; std::deque<size_t> ansSet(&ans[0], &ans[arrayLength(ans)]);
size_t ans1[] = { 686, 459, 278, 200, 404, 834, 64, 203, 760, 950 }; CPPUNIT_ASSERT(std::equal(fastSet.begin(), fastSet.end(), ansSet.begin()));
std::deque<size_t> ansSet1(&ans1[0], &ans1[10]);
CPPUNIT_ASSERT(std::equal(fastSet.begin(), fastSet.end(), ansSet1.begin()));
} }
ipaddr = "10.0.0.1"; ipaddr = "10.0.0.1";
{ {
std::deque<size_t> fastSet; std::deque<size_t> fastSet;
btContext.computeFastSet(fastSet, ipaddr, fastSetSize); btContext.computeFastSet(fastSet, ipaddr, fastSetSize);
size_t ans2[] = { 568, 188, 466, 452, 550, 662, 109, 226, 398, 11 }; size_t ans[] = { 568, 188, 466, 452, 550, 662, 109, 226, 398, 11 };
std::deque<size_t> ansSet2(&ans2[0], &ans2[10]); std::deque<size_t> ansSet(&ans[0], &ans[arrayLength(ans)]);
CPPUNIT_ASSERT(std::equal(fastSet.begin(), fastSet.end(), ansSet2.begin())); CPPUNIT_ASSERT(std::equal(fastSet.begin(), fastSet.end(), ansSet.begin()));
}
// See when pieces < fastSetSize
btContext.setNumPieces(9);
{
std::deque<size_t> fastSet;
btContext.computeFastSet(fastSet, ipaddr, fastSetSize);
size_t ans[] = { 8, 6, 7, 5, 1, 4, 0, 2, 3 };
std::deque<size_t> ansSet(&ans[0], &ans[arrayLength(ans)]);
CPPUNIT_ASSERT(std::equal(fastSet.begin(), fastSet.end(), ansSet.begin()));
} }
} }