mirror of
https://github.com/aria2/aria2.git
synced 2025-04-05 05:27:38 +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
100 lines
3.1 KiB
C++
100 lines
3.1 KiB
C++
#include "MetalinkEntry.h"
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
using namespace std;
|
|
|
|
class MetalinkEntryTest:public CppUnit::TestFixture {
|
|
|
|
CPPUNIT_TEST_SUITE(MetalinkEntryTest);
|
|
CPPUNIT_TEST(testDropUnsupportedResource);
|
|
CPPUNIT_TEST(testReorderResourcesByPreference);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
|
|
public:
|
|
void setUp() {
|
|
}
|
|
void tearDown() {
|
|
}
|
|
|
|
void testDropUnsupportedResource();
|
|
void testReorderResourcesByPreference();
|
|
};
|
|
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION( MetalinkEntryTest );
|
|
|
|
MetalinkEntry* createTestEntry() {
|
|
MetalinkEntry* entry = new MetalinkEntry();
|
|
MetalinkResource* res1 = new MetalinkResource();
|
|
res1->url = "ftp://myhost/aria2.tar.bz2";
|
|
res1->type = MetalinkResource::TYPE_FTP;
|
|
res1->location = "RO";
|
|
res1->preference = 50;
|
|
MetalinkResource* res2 = new MetalinkResource();
|
|
res2->url = "http://myhost/aria2.tar.bz2";
|
|
res2->type = MetalinkResource::TYPE_HTTP;
|
|
res2->location = "AT";
|
|
res2->preference = 100;
|
|
MetalinkResource* res3 = new MetalinkResource();
|
|
res3->url = "http://myhost/aria2.torrent";
|
|
res3->type = MetalinkResource::TYPE_BITTORRENT;
|
|
res3->location = "al";
|
|
res3->preference = 60;
|
|
MetalinkResource* res4 = new MetalinkResource();
|
|
res4->url = "http://myhost/aria2.ext";
|
|
res4->type = MetalinkResource::TYPE_NOT_SUPPORTED;
|
|
res4->location = "ad";
|
|
res4->preference = 10;
|
|
MetalinkResource* res5 = new MetalinkResource();
|
|
res5->url = "https://myhost/aria2.tar.bz2";
|
|
res5->type = MetalinkResource::TYPE_HTTPS;
|
|
res5->location = "jp";
|
|
res5->preference = 90;
|
|
|
|
entry->resources.push_back(res1);
|
|
entry->resources.push_back(res2);
|
|
entry->resources.push_back(res3);
|
|
entry->resources.push_back(res4);
|
|
entry->resources.push_back(res5);
|
|
return entry;
|
|
}
|
|
|
|
void MetalinkEntryTest::testDropUnsupportedResource() {
|
|
MetalinkEntry* entry = createTestEntry();
|
|
|
|
entry->dropUnsupportedResource();
|
|
#if defined ENABLE_SSL && ENABLE_BITTORRENT
|
|
CPPUNIT_ASSERT_EQUAL(4, (int)entry->resources.size());
|
|
#elif defined ENABLE_SSL || ENABLE_BITTORRENT
|
|
CPPUNIT_ASSERT_EQUAL(3, (int)entry->resources.size());
|
|
#else
|
|
CPPUNIT_ASSERT_EQUAL(2, (int)entry->resources.size());
|
|
#endif // ENABLE_MESSAGE_DIGEST
|
|
|
|
MetalinkResources::const_iterator itr = entry->resources.begin();
|
|
CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_FTP,
|
|
(*itr++)->type);
|
|
CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_HTTP,
|
|
(*itr++)->type);
|
|
#ifdef ENABLE_BITTORRENT
|
|
CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_BITTORRENT,
|
|
(*itr++)->type);
|
|
#endif // ENABLE_BITTORRENT
|
|
#ifdef ENABLE_SSL
|
|
CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_HTTPS,
|
|
(*itr++)->type);
|
|
#endif // ENABLE_SSL
|
|
}
|
|
|
|
void MetalinkEntryTest::testReorderResourcesByPreference() {
|
|
MetalinkEntry* entry = createTestEntry();
|
|
|
|
entry->reorderResourcesByPreference();
|
|
|
|
CPPUNIT_ASSERT_EQUAL(100, entry->resources.at(0)->preference);
|
|
CPPUNIT_ASSERT_EQUAL(90, entry->resources.at(1)->preference);
|
|
CPPUNIT_ASSERT_EQUAL(60, entry->resources.at(2)->preference);
|
|
CPPUNIT_ASSERT_EQUAL(50, entry->resources.at(3)->preference);
|
|
CPPUNIT_ASSERT_EQUAL(10, entry->resources.at(4)->preference);
|
|
}
|