mirror of
https://github.com/aria2/aria2.git
synced 2025-04-06 05:57:36 +03:00
e85f9ccfd6
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
156 lines
4.7 KiB
C++
156 lines
4.7 KiB
C++
#include "IteratableChunkChecksumValidator.h"
|
|
#include "DefaultDiskWriter.h"
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
using namespace std;
|
|
|
|
class IteratableChunkChecksumValidatorTest:public CppUnit::TestFixture {
|
|
|
|
CPPUNIT_TEST_SUITE(IteratableChunkChecksumValidatorTest);
|
|
CPPUNIT_TEST(testValidate);
|
|
/*
|
|
CPPUNIT_TEST(testValidate2);
|
|
CPPUNIT_TEST(testValidate3);
|
|
CPPUNIT_TEST(testValidate4);
|
|
*/
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
|
|
static const char* csArray[];// = { "29b0e7878271645fffb7eec7db4a7473a1c00bc1",
|
|
// "4df75a661cb7eb2733d9cdaa7f772eae3a4e2976",
|
|
// "0a4ea2f7dd7c52ddf2099a444ab2184b4d341bdb" };
|
|
public:
|
|
void setUp() {
|
|
}
|
|
|
|
void testValidate();
|
|
/*
|
|
void testValidate2();
|
|
void testValidate3();
|
|
void testValidate4();
|
|
*/
|
|
};
|
|
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION( IteratableChunkChecksumValidatorTest );
|
|
|
|
const char* IteratableChunkChecksumValidatorTest::csArray[] = { "29b0e7878271645fffb7eec7db4a7473a1c00bc1",
|
|
"4df75a661cb7eb2733d9cdaa7f772eae3a4e2976",
|
|
"0a4ea2f7dd7c52ddf2099a444ab2184b4d341bdb" };
|
|
|
|
void IteratableChunkChecksumValidatorTest::testValidate() {
|
|
BitfieldMan bitfieldMan(100, 250);
|
|
bitfieldMan.setAllBit();
|
|
Strings checksums(&csArray[0], &csArray[3]);
|
|
|
|
DefaultDiskWriterHandle diskWriter = new DefaultDiskWriter();
|
|
diskWriter->openExistingFile("chunkChecksumTestFile250.txt");
|
|
|
|
ChunkChecksumHandle chunkChecksum = new ChunkChecksum("sha1",
|
|
checksums,
|
|
100);
|
|
IteratableChunkChecksumValidator validator;
|
|
validator.setDiskWriter(diskWriter);
|
|
validator.setBitfield(&bitfieldMan);
|
|
validator.setChunkChecksum(chunkChecksum);
|
|
|
|
validator.init();
|
|
validator.validateChunk();
|
|
CPPUNIT_ASSERT(!validator.finished());
|
|
validator.validateChunk();
|
|
CPPUNIT_ASSERT(!validator.finished());
|
|
validator.validateChunk();
|
|
CPPUNIT_ASSERT(validator.finished());
|
|
CPPUNIT_ASSERT(bitfieldMan.isAllBitSet());
|
|
|
|
checksums[1] = "ffffffffffffffffffffffffffffffffffffffff";
|
|
chunkChecksum = new ChunkChecksum("sha1",
|
|
checksums,
|
|
100);
|
|
validator.setChunkChecksum(chunkChecksum);
|
|
|
|
validator.init();
|
|
while(!validator.finished()) {
|
|
validator.validateChunk();
|
|
}
|
|
CPPUNIT_ASSERT(bitfieldMan.isBitSet(0));
|
|
CPPUNIT_ASSERT(!bitfieldMan.isBitSet(1));
|
|
CPPUNIT_ASSERT(bitfieldMan.isBitSet(2));
|
|
}
|
|
/*
|
|
void IteratableChunkChecksumValidatorTest::testValidate2() {
|
|
BitfieldMan bitfieldMan(50, 250);
|
|
bitfieldMan.setAllBit();
|
|
Strings checksums(&csArray[0], &csArray[3]);
|
|
|
|
DefaultDiskWriterHandle diskWriter = new DefaultDiskWriter();
|
|
diskWriter->openExistingFile("chunkChecksumTestFile250.txt");
|
|
|
|
IteratableChunkChecksumValidator validator;
|
|
validator.setDiskWriter(diskWriter);
|
|
|
|
validator.validate(&bitfieldMan, checksums, 100);
|
|
|
|
CPPUNIT_ASSERT(bitfieldMan.isAllBitSet());
|
|
|
|
checksums[1] = "ffffffffffffffffffffffffffffffffffffffff";
|
|
validator.validate(&bitfieldMan, checksums, 100);
|
|
|
|
CPPUNIT_ASSERT(bitfieldMan.isBitSet(0));
|
|
CPPUNIT_ASSERT(bitfieldMan.isBitSet(1));
|
|
CPPUNIT_ASSERT(!bitfieldMan.isBitSet(2));
|
|
CPPUNIT_ASSERT(!bitfieldMan.isBitSet(3));
|
|
CPPUNIT_ASSERT(bitfieldMan.isBitSet(4));
|
|
}
|
|
|
|
void IteratableChunkChecksumValidatorTest::testValidate3() {
|
|
BitfieldMan bitfieldMan(50, 250);
|
|
bitfieldMan.setAllBit();
|
|
Strings checksums;
|
|
checksums.push_back("898a81b8e0181280ae2ee1b81e269196d91e869a");
|
|
|
|
DefaultDiskWriterHandle diskWriter = new DefaultDiskWriter();
|
|
diskWriter->openExistingFile("chunkChecksumTestFile250.txt");
|
|
|
|
IteratableChunkChecksumValidator validator;
|
|
validator.setDiskWriter(diskWriter);
|
|
|
|
validator.validate(&bitfieldMan, checksums, 250);
|
|
|
|
CPPUNIT_ASSERT(bitfieldMan.isAllBitSet());
|
|
|
|
checksums[0] = "ffffffffffffffffffffffffffffffffffffffff";
|
|
|
|
validator.validate(&bitfieldMan, checksums, 250);
|
|
|
|
CPPUNIT_ASSERT(!bitfieldMan.isBitSet(0));
|
|
CPPUNIT_ASSERT(!bitfieldMan.isBitSet(1));
|
|
CPPUNIT_ASSERT(!bitfieldMan.isBitSet(2));
|
|
CPPUNIT_ASSERT(!bitfieldMan.isBitSet(3));
|
|
CPPUNIT_ASSERT(!bitfieldMan.isBitSet(4));
|
|
}
|
|
|
|
void IteratableChunkChecksumValidatorTest::testValidate4() {
|
|
BitfieldMan bitfieldMan(70, 250);
|
|
bitfieldMan.setAllBit();
|
|
Strings checksums(&csArray[0], &csArray[3]);
|
|
|
|
DefaultDiskWriterHandle diskWriter = new DefaultDiskWriter();
|
|
diskWriter->openExistingFile("chunkChecksumTestFile250.txt");
|
|
|
|
IteratableChunkChecksumValidator validator;
|
|
validator.setDiskWriter(diskWriter);
|
|
|
|
validator.validate(&bitfieldMan, checksums, 100);
|
|
|
|
CPPUNIT_ASSERT(bitfieldMan.isAllBitSet());
|
|
|
|
checksums[1] = "ffffffffffffffffffffffffffffffffffffffff";
|
|
validator.validate(&bitfieldMan, checksums, 100);
|
|
|
|
CPPUNIT_ASSERT(bitfieldMan.isBitSet(0));
|
|
CPPUNIT_ASSERT(!bitfieldMan.isBitSet(1));
|
|
CPPUNIT_ASSERT(!bitfieldMan.isBitSet(2));
|
|
CPPUNIT_ASSERT(bitfieldMan.isBitSet(3));
|
|
}
|
|
*/
|