mirror of
https://github.com/aria2/aria2.git
synced 2025-04-05 05:27:38 +03:00
2007-08-08 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
MessageDigestHelper is introduced in order to simplify the use of message digest. Removed repeated code. The message digest algorithm is now specified by string, like "sha1", "md5". * src/messageDigest.{h, cc} * src/MessageDigestHelper.{h, cc}: New class. * src/DefaultPieceStorage.cc * src/DefaultBtContext.{h, cc} (computeFastSet): New function. (setInfoHash): Added for unit testing. (setNumPieces): Added for unit testing. * src/DefaultBtInteractive.cc * src/BtPieceMessage.cc * src/Peer.cc * src/Checksum.h * src/message.h * src/IteratableChecksumValidator.h * src/ChunkChecksumValidator.{h, cc}: Use IteratableChecksumValidator inside it. * src/SegmentMan.{h, cc} (checkIntegrity): Removed. * src/IteratableChunkChecksumValidator.{h, cc} * src/Util.h (sha1Sum): Removed. (simpleMessageDigest): Removed. (fileChecksum): Removed. (computeFastSet): Removed. * src/ShaVisitor.cc * src/ChunkChecksum.h * src/DownloadCommand.cc Removed messageDigest virtual functions. * src/MultiDiskAdaptor.{h, cc} * src/DiskAdaptor.h * src/ByteArrayDiskWriter.h * src/DiskWriter.h * src/DiskAdaptorWriter.h * src/AbstractSingleDiskAdaptor.{h, cc} * src/AbstractDiskWriter.{h, cc} Fixed comilation error when message digest is disabled. * src/MetalinkEntry.{h, cc} * src/MetalinkRequestInfo.cc Removed srandom and random. * src/SimpleRandomizer.h Added size() virtual function to DiskAdaptor * src/MultiDiskAdaptor.h Fixed the bug that causes that files are not opened correctly in multi-file torrent. * src/TorrentRequestInfo.cc * src/MultiDiskAdaptor.cc Added SHA256 support * src/messageDigest.cc * src/Xml2MetalinkProcessor.cc Show supported message digest algorithms * src/main.cc Updated contact info. * src/main.cc
This commit is contained in:
parent
45f949c713
commit
e85f9ccfd6
67 changed files with 1230 additions and 787 deletions
|
@ -55,6 +55,24 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
class SortMockBtRequestMessage {
|
||||
public:
|
||||
bool operator()(const SharedHandle<MockBtRequestMessage>& a,
|
||||
const SharedHandle<MockBtRequestMessage>& b) {
|
||||
if(a->index < b->index) {
|
||||
return true;
|
||||
} else if(b->index < a->index) {
|
||||
return false;
|
||||
} else if(a->blockIndex < b->blockIndex) {
|
||||
return true;
|
||||
} else if(b->blockIndex < a->blockIndex) {
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
void setUp() {
|
||||
BtRegistry::clear();
|
||||
btContext = new MockBtContext();
|
||||
|
@ -142,6 +160,8 @@ void DefaultBtRequestFactoryTest::testCreateRequestMessages_onEndGame() {
|
|||
|
||||
BtMessages msgs = btRequestFactory->createRequestMessagesOnEndGame(3);
|
||||
|
||||
sort(msgs.begin(), msgs.end(), SortMockBtRequestMessage());
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL((size_t)3, msgs.size());
|
||||
BtMessages::iterator itr = msgs.begin();
|
||||
MockBtRequestMessage* msg = (MockBtRequestMessage*)itr->get();
|
||||
|
@ -150,11 +170,11 @@ void DefaultBtRequestFactoryTest::testCreateRequestMessages_onEndGame() {
|
|||
++itr;
|
||||
msg = (MockBtRequestMessage*)itr->get();
|
||||
CPPUNIT_ASSERT_EQUAL(1, msg->index);
|
||||
CPPUNIT_ASSERT_EQUAL(1, msg->blockIndex);
|
||||
CPPUNIT_ASSERT_EQUAL(0, msg->blockIndex);
|
||||
++itr;
|
||||
msg = (MockBtRequestMessage*)itr->get();
|
||||
CPPUNIT_ASSERT_EQUAL(1, msg->index);
|
||||
CPPUNIT_ASSERT_EQUAL(0, msg->blockIndex);
|
||||
CPPUNIT_ASSERT_EQUAL(1, msg->blockIndex);
|
||||
}
|
||||
|
||||
void DefaultBtRequestFactoryTest::testRemoveTargetPiece() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue