mirror of
https://github.com/aria2/aria2.git
synced 2025-04-05 21:47:37 +03:00
58dbaafc85
* src/FtpNegotiateCommand.cc (recvGreeting): Call disableWriteCheckSocket just after socket->setBlockingMode(). This avoids unnecessary CPU-hog loop. 2006-08-07 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> * src/PeerChokeCommand.h (PeerChokeCommand): Rearranged the arguments. * src/PeerChokeCommand.cc (PeerChokeCommand): Rearranged the arguments. * src/MetalinkEntry.h (Checksum.h): Included. (md5): Removed. (sha1): Removed. (checksum): New variable. (operator=): Updated. (check): Removed. * src/prefs.h (PREF_LOWEST_SPEED_LIMIT): New definition. (PREF_FOLLOW_TORRENT): New definition. (PREF_SELECT_FILE): New definition. (PREF_FOLLOW_METALINK): New definition. * src/MetalinkResource.h (TYPE_HTTPS): Added to enum TYPE. * src/TorrentMan.cc (~TorrentMan): Rewritten. * src/MultiDiskWriter.cc (MultiDiskAdaptor): Updated according to the changes in MessageDigestContext. (~MultiDiskAdaptor): Updated according to the changes in MessageDigestContext. (hashUpdate): Updated according to the changes in MessageDigestContext. (sha1Sum): Updated according to the changes in MessageDigestContext. * src/Util.h (fileChecksum): Updated according to the changes in MessageDigestContext. * src/Util.cc (sha1Sum): Updated according to the changes in MessageDigestContext. (fileChecksum): Updated according to the changes in MessageDigestContext. * src/messageDigest.h: Rewritten. * src/MetalinkEntry.cc (check): Removed. (Supported): Updated. (dropUnsupportedResource): Fixed a memory leak. * src/ShaVisitor.cc (ShaVisitor): Updated according to the changes in MessageDigestContext. (~ShaVisitor): Updated according to the changes in MessageDigestContext. (visit): Updated according to the changes in MessageDigestContext. * src/main.cc (main): Rewritten the portion of download loop. --lowest-speed-limit command-line option added. * src/DownloadEngine.h (SocketEntry): New class. (SocketEntries): New definition. (PairFind): Removed. (SockCmdMap): Removed. * src/DownloadEngine.cc (DownloadEngine): Rewritten. (~DownloadEngine): Rewritten. (run): Renamed activeCommandUuids as activeUuids. (SetDescriptor): Rewritten. (AccumulateActiveCommandUuid): Removed. (AccumulateActiveUuid): New function object. (waitData): Rewritten. (updateFdSet): Rewritten. (addSocket): Rewritten. (deleteSocket): Rewritten. (addSocketForReadCheck): Rewritten. (deleteSocketForReadCheck): Rewritten. (addSocketForWriteCheck): Rewritten. (deleteSocketForWriteCheck): Rewritten. * src/Xml2MetalinkProcessor.cc (getEntry): Rewritten the portion of MetalinkEntry creation. * src/DownloadCommand.cc (executeInternal): Added the check routine for lowest speed limit. * src/AbstractDiskWriter.cc (AbstractDiskWriter): Updated according to the changes in MessageDigestContext. (~AbstractDiskWriter): Updated according to the changes in MessageDigestContext. (sha1Sum): Updated according to the changes in MessageDigestContext. * src/RequestInfo.h: New class. * src/UrlRequestInfo.h: New class. * src/UrlRequestInfo.cc: New class. * src/TorrentRequestInfo.h: New class. * src/TorrentRequestInfo.cc: New class. * src/MetalinkRequestInfo.h: New class. * src/MetalinkRequestInfo.cc: New class. * src/Checksum.h: New class. * src/DownloadEngineFactory.h: New class. * src/DownloadEngineFactory.cc: New class.
104 lines
3.2 KiB
C++
104 lines
3.2 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(testCheck);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
|
|
public:
|
|
void setUp() {
|
|
}
|
|
void tearDown() {
|
|
}
|
|
|
|
void testDropUnsupportedResource();
|
|
void testReorderResourcesByPreference();
|
|
void testCheck();
|
|
};
|
|
|
|
|
|
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();
|
|
|
|
CPPUNIT_ASSERT_EQUAL(4, (int)entry->resources.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL((int)MetalinkResource::TYPE_FTP,
|
|
entry->resources.at(0)->type);
|
|
CPPUNIT_ASSERT_EQUAL((int)MetalinkResource::TYPE_HTTP,
|
|
entry->resources.at(1)->type);
|
|
CPPUNIT_ASSERT_EQUAL((int)MetalinkResource::TYPE_BITTORRENT,
|
|
entry->resources.at(2)->type);
|
|
CPPUNIT_ASSERT_EQUAL((int)MetalinkResource::TYPE_HTTPS,
|
|
entry->resources.at(3)->type);
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
void MetalinkEntryTest::testCheck() {
|
|
MetalinkEntry entry;
|
|
string filename = "4096chunk.txt";
|
|
CPPUNIT_ASSERT(entry.check(filename));
|
|
entry.md5 = "82a7348c2e03731109d0cf45a7325b88";
|
|
CPPUNIT_ASSERT(entry.check(filename));
|
|
entry.md5 = "00000000000000000000000000000000";
|
|
CPPUNIT_ASSERT(!entry.check(filename));
|
|
entry.sha1 = "608cabc0f2fa18c260cafd974516865c772363d5";
|
|
CPPUNIT_ASSERT(entry.check(filename));
|
|
}
|