mirror of
https://github.com/aria2/aria2.git
synced 2025-04-04 21:17:41 +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
83 lines
2.1 KiB
C++
83 lines
2.1 KiB
C++
#include "RequestGroupMan.h"
|
|
#include "ConsoleDownloadEngine.h"
|
|
#include "CUIDCounter.h"
|
|
#include "prefs.h"
|
|
#include "RequestFactory.h"
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
using namespace std;
|
|
|
|
class RequestGroupManTest : public CppUnit::TestFixture {
|
|
|
|
CPPUNIT_TEST_SUITE(RequestGroupManTest);
|
|
CPPUNIT_TEST(testIsSameFileBeingDownloaded);
|
|
CPPUNIT_TEST(testGetInitialCommands);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
|
|
public:
|
|
void setUp()
|
|
{
|
|
CUIDCounterHandle counter = new CUIDCounter();
|
|
CUIDCounterSingletonHolder::instance(counter);
|
|
}
|
|
|
|
void testIsSameFileBeingDownloaded();
|
|
void testGetInitialCommands();
|
|
};
|
|
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION( RequestGroupManTest );
|
|
|
|
void RequestGroupManTest::testIsSameFileBeingDownloaded()
|
|
{
|
|
Option option;
|
|
RequestGroupMan gm;
|
|
|
|
RequestGroupHandle rg1 = new RequestGroup("http://localhost/aria2.tar.bz2",
|
|
&option);
|
|
RequestGroupHandle rg2 = new RequestGroup("http://localhost/aria2.tar.bz2",
|
|
&option);
|
|
|
|
gm.addRequestGroup(rg1);
|
|
gm.addRequestGroup(rg2);
|
|
|
|
rg1->initSegmentMan();
|
|
rg2->initSegmentMan();
|
|
|
|
rg1->getSegmentMan()->filename = "aria2.tar.bz2";
|
|
rg2->getSegmentMan()->filename = "aria2.tar.bz2";
|
|
|
|
CPPUNIT_ASSERT(gm.isSameFileBeingDownloaded(rg1.get()));
|
|
|
|
rg2->getSegmentMan()->filename = "aria2-0.10.2.tar.bz2";
|
|
|
|
CPPUNIT_ASSERT(!gm.isSameFileBeingDownloaded(rg1.get()));
|
|
|
|
}
|
|
|
|
void RequestGroupManTest::testGetInitialCommands()
|
|
{
|
|
Option option;
|
|
option.put(PREF_SPLIT, "1");
|
|
option.put(PREF_TIMEOUT, "10");
|
|
|
|
RequestFactoryHandle requestFactory = new RequestFactory();
|
|
requestFactory->setOption(&option);
|
|
RequestFactorySingletonHolder::instance(requestFactory);
|
|
|
|
RequestGroupMan gm;
|
|
|
|
RequestGroupHandle rg1 = new RequestGroup("aria2.tar.bz2.metalink",
|
|
&option);
|
|
RequestGroupHandle rg2 = new RequestGroup("http://localhost/aria2.tar.bz2",
|
|
&option);
|
|
|
|
gm.addRequestGroup(rg1);
|
|
gm.addRequestGroup(rg2);
|
|
|
|
ConsoleDownloadEngine e;
|
|
e.option = &option;
|
|
Commands commands = gm.getInitialCommands(&e);
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, commands.size());
|
|
}
|