github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Made public member variable in Metalinker private
	* src/MetalinkParserController.cc
	* src/Metalinker.cc
	* src/Metalinker.h
	* test/MetalinkParserControllerTest.cc
	* test/MetalinkProcessorTest.cc
	* test/MetalinkerTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2010-06-12 14:39:26 +00:00
parent 95b3beb23d
commit 8d1da8bd3e
7 changed files with 92 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Made public member variable in Metalinker private
* src/MetalinkParserController.cc
* src/Metalinker.cc
* src/Metalinker.h
* test/MetalinkParserControllerTest.cc
* test/MetalinkProcessorTest.cc
* test/MetalinkerTest.cc
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variables Renamed member variables

2
src/MetalinkParserController.cc
View File

@ -138,7 +138,7 @@ void MetalinkParserController::commitEntryTransaction()
commitChunkChecksumTransactionV4(); commitChunkChecksumTransactionV4();
commitChunkChecksumTransaction(); commitChunkChecksumTransaction();
commitSignatureTransaction(); commitSignatureTransaction();
_metalinker->entries.push_back(_tEntry); _metalinker->addEntry(_tEntry);
_tEntry.reset(); _tEntry.reset();
} }

5
src/Metalinker.cc
View File

@ -42,7 +42,8 @@ Metalinker::Metalinker() {}
Metalinker::~Metalinker() {} Metalinker::~Metalinker() {}
class EntryQuery:public std::unary_function<SharedHandle<MetalinkEntry>, bool> { class EntryQuery:
public std::unary_function<SharedHandle<MetalinkEntry>, bool> {
private: private:
std::string version; std::string version;
std::string language; std::string language;
@ -81,7 +82,7 @@ void Metalinker::queryEntry
const std::string& language, const std::string& language,
const std::string& os) const const std::string& os) const
{ {
std::remove_copy_if(entries.begin(), entries.end(), std::remove_copy_if(_entries.begin(), _entries.end(),
std::back_inserter(queryResult), std::back_inserter(queryResult),
std::not1(EntryQuery(version, language, os))); std::not1(EntryQuery(version, language, os)));
} }

16
src/Metalinker.h
View File

@ -47,15 +47,15 @@ namespace aria2 {
class MetalinkEntry; class MetalinkEntry;
class Metalinker { class Metalinker {
public: private:
std::vector<SharedHandle<MetalinkEntry> > entries; std::vector<SharedHandle<MetalinkEntry> > _entries;
public: public:
Metalinker(); Metalinker();
~Metalinker(); ~Metalinker();
Metalinker& operator=(const Metalinker& metalinker) { Metalinker& operator=(const Metalinker& metalinker) {
if(this != &metalinker) { if(this != &metalinker) {
this->entries = metalinker.entries; _entries = metalinker._entries;
} }
return *this; return *this;
} }
@ -65,6 +65,16 @@ public:
const std::string& version, const std::string& version,
const std::string& language, const std::string& language,
const std::string& os) const; const std::string& os) const;
const std::vector<SharedHandle<MetalinkEntry> >& getEntries() const
{
return _entries;
}
void addEntry(const SharedHandle<MetalinkEntry>& entry)
{
_entries.push_back(entry);
}
}; };
} // namespace aria2 } // namespace aria2

56
test/MetalinkParserControllerTest.cc
View File

@ -63,8 +63,8 @@ void MetalinkParserControllerTest::testEntryTransaction()
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
{ {
SharedHandle<Metalinker> m = ctrl.getResult(); SharedHandle<Metalinker> m = ctrl.getResult();
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
SharedHandle<MetalinkEntry> e = m->entries.front(); SharedHandle<MetalinkEntry> e = m->getEntries().front();
CPPUNIT_ASSERT_EQUAL(std::string("aria2.tar.bz2"), e->file->getPath()); CPPUNIT_ASSERT_EQUAL(std::string("aria2.tar.bz2"), e->file->getPath());
CPPUNIT_ASSERT_EQUAL((uint64_t)(1024*1024ULL), e->file->getLength()); CPPUNIT_ASSERT_EQUAL((uint64_t)(1024*1024ULL), e->file->getLength());
CPPUNIT_ASSERT_EQUAL((off_t)0, e->file->getOffset()); CPPUNIT_ASSERT_EQUAL((off_t)0, e->file->getOffset());
@ -74,7 +74,7 @@ void MetalinkParserControllerTest::testEntryTransaction()
} }
ctrl.newEntryTransaction(); ctrl.newEntryTransaction();
ctrl.cancelEntryTransaction(); ctrl.cancelEntryTransaction();
CPPUNIT_ASSERT_EQUAL((size_t)1, ctrl.getResult()->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, ctrl.getResult()->getEntries().size());
} }
void MetalinkParserControllerTest::testResourceTransaction() void MetalinkParserControllerTest::testResourceTransaction()
@ -90,8 +90,8 @@ void MetalinkParserControllerTest::testResourceTransaction()
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
{ {
SharedHandle<Metalinker> m = ctrl.getResult(); SharedHandle<Metalinker> m = ctrl.getResult();
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.front()->resources.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().front()->resources.size());
SharedHandle<MetalinkResource> res = m->entries.front()->resources[0]; SharedHandle<MetalinkResource> res = m->getEntries().front()->resources[0];
CPPUNIT_ASSERT_EQUAL(std::string("http://mirror/aria2.tar.bz2"), res->url); CPPUNIT_ASSERT_EQUAL(std::string("http://mirror/aria2.tar.bz2"), res->url);
CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_HTTP, res->type); CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_HTTP, res->type);
CPPUNIT_ASSERT_EQUAL(std::string("US"), res->location); CPPUNIT_ASSERT_EQUAL(std::string("US"), res->location);
@ -104,9 +104,9 @@ void MetalinkParserControllerTest::testResourceTransaction()
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
{ {
SharedHandle<Metalinker> m = ctrl.getResult(); SharedHandle<Metalinker> m = ctrl.getResult();
CPPUNIT_ASSERT_EQUAL((size_t)2, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)2, m->getEntries().size());
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries[0]->resources.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries()[0]->resources.size());
CPPUNIT_ASSERT_EQUAL((size_t)0, m->entries[1]->resources.size()); CPPUNIT_ASSERT_EQUAL((size_t)0, m->getEntries()[1]->resources.size());
} }
} }
@ -123,9 +123,9 @@ void MetalinkParserControllerTest::testMetaurlTransaction()
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
{ {
SharedHandle<Metalinker> m = ctrl.getResult(); SharedHandle<Metalinker> m = ctrl.getResult();
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries[0]->metaurls.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries()[0]->metaurls.size());
SharedHandle<MetalinkMetaurl> metaurl = m->entries[0]->metaurls[0]; SharedHandle<MetalinkMetaurl> metaurl = m->getEntries()[0]->metaurls[0];
CPPUNIT_ASSERT_EQUAL(std::string("http://example.org/chocolate.torrent"), CPPUNIT_ASSERT_EQUAL(std::string("http://example.org/chocolate.torrent"),
metaurl->url); metaurl->url);
CPPUNIT_ASSERT_EQUAL(std::string("torrent"), metaurl->mediatype); CPPUNIT_ASSERT_EQUAL(std::string("torrent"), metaurl->mediatype);
@ -138,15 +138,15 @@ void MetalinkParserControllerTest::testMetaurlTransaction()
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
{ {
SharedHandle<Metalinker> m = ctrl.getResult(); SharedHandle<Metalinker> m = ctrl.getResult();
CPPUNIT_ASSERT_EQUAL((size_t)2, ctrl.getResult()->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)2, ctrl.getResult()->getEntries().size());
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries[0]->metaurls.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries()[0]->metaurls.size());
CPPUNIT_ASSERT_EQUAL((size_t)0, m->entries[1]->metaurls.size()); CPPUNIT_ASSERT_EQUAL((size_t)0, m->getEntries()[1]->metaurls.size());
} }
#else // !ENABLE_BITTORRENT #else // !ENABLE_BITTORRENT
{ {
SharedHandle<Metalinker> m = ctrl.getResult(); SharedHandle<Metalinker> m = ctrl.getResult();
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
CPPUNIT_ASSERT_EQUAL((size_t)0, m->entries[0]->metaurls.size()); CPPUNIT_ASSERT_EQUAL((size_t)0, m->getEntries()[0]->metaurls.size());
} }
#endif // !ENABLE_BITTORRENT #endif // !ENABLE_BITTORRENT
} }
@ -162,7 +162,7 @@ void MetalinkParserControllerTest::testChecksumTransaction()
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
{ {
SharedHandle<Metalinker> m = ctrl.getResult(); SharedHandle<Metalinker> m = ctrl.getResult();
SharedHandle<Checksum> md = m->entries.front()->checksum; SharedHandle<Checksum> md = m->getEntries().front()->checksum;
CPPUNIT_ASSERT_EQUAL(std::string("md5"), md->getAlgo()); CPPUNIT_ASSERT_EQUAL(std::string("md5"), md->getAlgo());
CPPUNIT_ASSERT_EQUAL(std::string("acbd18db4cc2f85cedef654fccc4a4d8"), CPPUNIT_ASSERT_EQUAL(std::string("acbd18db4cc2f85cedef654fccc4a4d8"),
md->getMessageDigest()); md->getMessageDigest());
@ -172,13 +172,13 @@ void MetalinkParserControllerTest::testChecksumTransaction()
ctrl.setTypeOfChecksum("md5"); ctrl.setTypeOfChecksum("md5");
ctrl.setHashOfChecksum("badhash"); ctrl.setHashOfChecksum("badhash");
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
CPPUNIT_ASSERT(ctrl.getResult()->entries[1]->checksum.isNull()); CPPUNIT_ASSERT(ctrl.getResult()->getEntries()[1]->checksum.isNull());
ctrl.newEntryTransaction(); ctrl.newEntryTransaction();
ctrl.newChecksumTransaction(); ctrl.newChecksumTransaction();
ctrl.cancelChecksumTransaction(); ctrl.cancelChecksumTransaction();
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
CPPUNIT_ASSERT(ctrl.getResult()->entries[2]->checksum.isNull()); CPPUNIT_ASSERT(ctrl.getResult()->getEntries()[2]->checksum.isNull());
} }
void MetalinkParserControllerTest::testChunkChecksumTransaction() void MetalinkParserControllerTest::testChunkChecksumTransaction()
@ -196,7 +196,7 @@ void MetalinkParserControllerTest::testChunkChecksumTransaction()
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
{ {
SharedHandle<Metalinker> m = ctrl.getResult(); SharedHandle<Metalinker> m = ctrl.getResult();
SharedHandle<ChunkChecksum> md = m->entries.front()->chunkChecksum; SharedHandle<ChunkChecksum> md = m->getEntries().front()->chunkChecksum;
CPPUNIT_ASSERT_EQUAL(std::string("md5"), md->getAlgo()); CPPUNIT_ASSERT_EQUAL(std::string("md5"), md->getAlgo());
CPPUNIT_ASSERT_EQUAL((size_t)256*1024, md->getChecksumLength()); CPPUNIT_ASSERT_EQUAL((size_t)256*1024, md->getChecksumLength());
CPPUNIT_ASSERT_EQUAL((size_t)5, md->countChecksum()); CPPUNIT_ASSERT_EQUAL((size_t)5, md->countChecksum());
@ -217,13 +217,13 @@ void MetalinkParserControllerTest::testChunkChecksumTransaction()
ctrl.setLengthOfChunkChecksum(256*1024); ctrl.setLengthOfChunkChecksum(256*1024);
ctrl.addHashOfChunkChecksum(1, "badhash"); ctrl.addHashOfChunkChecksum(1, "badhash");
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
CPPUNIT_ASSERT(ctrl.getResult()->entries[1]->chunkChecksum.isNull()); CPPUNIT_ASSERT(ctrl.getResult()->getEntries()[1]->chunkChecksum.isNull());
ctrl.newEntryTransaction(); ctrl.newEntryTransaction();
ctrl.newChunkChecksumTransaction(); ctrl.newChunkChecksumTransaction();
ctrl.cancelChunkChecksumTransaction(); ctrl.cancelChunkChecksumTransaction();
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
CPPUNIT_ASSERT(ctrl.getResult()->entries[2]->chunkChecksum.isNull()); CPPUNIT_ASSERT(ctrl.getResult()->getEntries()[2]->chunkChecksum.isNull());
} }
void MetalinkParserControllerTest::testChunkChecksumTransactionV4() void MetalinkParserControllerTest::testChunkChecksumTransactionV4()
@ -240,7 +240,7 @@ void MetalinkParserControllerTest::testChunkChecksumTransactionV4()
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
{ {
SharedHandle<Metalinker> m = ctrl.getResult(); SharedHandle<Metalinker> m = ctrl.getResult();
SharedHandle<ChunkChecksum> md = m->entries.front()->chunkChecksum; SharedHandle<ChunkChecksum> md = m->getEntries().front()->chunkChecksum;
CPPUNIT_ASSERT_EQUAL(std::string("sha-1"), md->getAlgo()); CPPUNIT_ASSERT_EQUAL(std::string("sha-1"), md->getAlgo());
CPPUNIT_ASSERT_EQUAL((size_t)256*1024, md->getChecksumLength()); CPPUNIT_ASSERT_EQUAL((size_t)256*1024, md->getChecksumLength());
CPPUNIT_ASSERT_EQUAL((size_t)3, md->countChecksum()); CPPUNIT_ASSERT_EQUAL((size_t)3, md->countChecksum());
@ -261,13 +261,13 @@ void MetalinkParserControllerTest::testChunkChecksumTransactionV4()
ctrl.addHashOfChunkChecksumV4("5bd9f7248df0f3a6a86ab6c95f48787d546efa14"); ctrl.addHashOfChunkChecksumV4("5bd9f7248df0f3a6a86ab6c95f48787d546efa14");
ctrl.addHashOfChunkChecksumV4("badhash"); ctrl.addHashOfChunkChecksumV4("badhash");
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
CPPUNIT_ASSERT(ctrl.getResult()->entries[1]->chunkChecksum.isNull()); CPPUNIT_ASSERT(ctrl.getResult()->getEntries()[1]->chunkChecksum.isNull());
ctrl.newEntryTransaction(); ctrl.newEntryTransaction();
ctrl.newChunkChecksumTransactionV4(); ctrl.newChunkChecksumTransactionV4();
ctrl.cancelChunkChecksumTransactionV4(); ctrl.cancelChunkChecksumTransactionV4();
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
CPPUNIT_ASSERT(ctrl.getResult()->entries[2]->chunkChecksum.isNull()); CPPUNIT_ASSERT(ctrl.getResult()->getEntries()[2]->chunkChecksum.isNull());
} }
#endif // ENABLE_MESSAGE_DIGEST #endif // ENABLE_MESSAGE_DIGEST
@ -293,8 +293,8 @@ void MetalinkParserControllerTest::testSignatureTransaction()
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
SharedHandle<Metalinker> m = ctrl.getResult(); SharedHandle<Metalinker> m = ctrl.getResult();
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
SharedHandle<Signature> sig = m->entries.front()->getSignature(); SharedHandle<Signature> sig = m->getEntries().front()->getSignature();
CPPUNIT_ASSERT_EQUAL(std::string("pgp"), sig->getType()); CPPUNIT_ASSERT_EQUAL(std::string("pgp"), sig->getType());
CPPUNIT_ASSERT_EQUAL(std::string("aria2.sig"), sig->getFile()); CPPUNIT_ASSERT_EQUAL(std::string("aria2.sig"), sig->getFile());
CPPUNIT_ASSERT_EQUAL(pgpSignature, sig->getBody()); CPPUNIT_ASSERT_EQUAL(pgpSignature, sig->getBody());
@ -304,7 +304,7 @@ void MetalinkParserControllerTest::testSignatureTransaction()
ctrl.newSignatureTransaction(); ctrl.newSignatureTransaction();
ctrl.cancelSignatureTransaction(); ctrl.cancelSignatureTransaction();
ctrl.commitEntryTransaction(); ctrl.commitEntryTransaction();
CPPUNIT_ASSERT(ctrl.getResult()->entries[1]->getSignature().isNull()); CPPUNIT_ASSERT(ctrl.getResult()->getEntries()[1]->getSignature().isNull());
} }
} // namespace aria2 } // namespace aria2

70
test/MetalinkProcessorTest.cc
View File

@ -86,8 +86,8 @@ void MetalinkProcessorTest::testParseFileV4()
SharedHandle<MetalinkEntry> e; SharedHandle<MetalinkEntry> e;
SharedHandle<MetalinkResource> r; SharedHandle<MetalinkResource> r;
SharedHandle<MetalinkMetaurl> mu; SharedHandle<MetalinkMetaurl> mu;
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
e = m->entries[0]; e = m->getEntries()[0];
CPPUNIT_ASSERT_EQUAL(std::string("example.ext"), e->getPath()); CPPUNIT_ASSERT_EQUAL(std::string("example.ext"), e->getPath());
CPPUNIT_ASSERT_EQUAL((uint64_t)786430LL, e->getLength()); CPPUNIT_ASSERT_EQUAL((uint64_t)786430LL, e->getLength());
CPPUNIT_ASSERT_EQUAL(-1, e->maxConnections); CPPUNIT_ASSERT_EQUAL(-1, e->maxConnections);
@ -166,7 +166,7 @@ void MetalinkProcessorTest::testParseFileV4_attrs()
"</metalink>"; "</metalink>";
dw->setString(StringFormat(tmpl, "foo").str()); dw->setString(StringFormat(tmpl, "foo").str());
m = proc.parseFromBinaryStream(dw); m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
// empty name // empty name
dw->setString(StringFormat(tmpl, "").str()); dw->setString(StringFormat(tmpl, "").str());
@ -204,15 +204,15 @@ void MetalinkProcessorTest::testParseFileV4_attrs()
dw->setString(StringFormat(tmpl, "1").str()); dw->setString(StringFormat(tmpl, "1").str());
m = proc.parseFromBinaryStream(dw); m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
dw->setString(StringFormat(tmpl, "100").str()); dw->setString(StringFormat(tmpl, "100").str());
m = proc.parseFromBinaryStream(dw); m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
dw->setString(StringFormat(tmpl, "999999").str()); dw->setString(StringFormat(tmpl, "999999").str());
m = proc.parseFromBinaryStream(dw); m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
dw->setString(StringFormat(tmpl, "1000000").str()); dw->setString(StringFormat(tmpl, "1000000").str());
try { try {
@ -246,15 +246,15 @@ void MetalinkProcessorTest::testParseFileV4_attrs()
dw->setString(StringFormat(tmpl, "1").str()); dw->setString(StringFormat(tmpl, "1").str());
m = proc.parseFromBinaryStream(dw); m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
dw->setString(StringFormat(tmpl, "100").str()); dw->setString(StringFormat(tmpl, "100").str());
m = proc.parseFromBinaryStream(dw); m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
dw->setString(StringFormat(tmpl, "999999").str()); dw->setString(StringFormat(tmpl, "999999").str());
m = proc.parseFromBinaryStream(dw); m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
dw->setString(StringFormat(tmpl, "1000000").str()); dw->setString(StringFormat(tmpl, "1000000").str());
try { try {
@ -296,7 +296,7 @@ void MetalinkProcessorTest::testParseFileV4_attrs()
dw->setString(StringFormat(tmpl, "torrent").str()); dw->setString(StringFormat(tmpl, "torrent").str());
m = proc.parseFromBinaryStream(dw); m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
// empty mediatype // empty mediatype
dw->setString(StringFormat(tmpl, "").str()); dw->setString(StringFormat(tmpl, "").str());
@ -319,7 +319,7 @@ void MetalinkProcessorTest::testParseFileV4_attrs()
dw->setString(StringFormat(tmpl, "foo").str()); dw->setString(StringFormat(tmpl, "foo").str());
m = proc.parseFromBinaryStream(dw); m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
// dir traversing // dir traversing
dw->setString(StringFormat(tmpl, "../doughnuts").str()); dw->setString(StringFormat(tmpl, "../doughnuts").str());
@ -498,8 +498,8 @@ void MetalinkProcessorTest::testParseFile()
try { try {
SharedHandle<Metalinker> metalinker = proc.parseFile("test.xml"); SharedHandle<Metalinker> metalinker = proc.parseFile("test.xml");
std::vector<SharedHandle<MetalinkEntry> >::iterator entryItr = std::vector<SharedHandle<MetalinkEntry> >::const_iterator entryItr =
metalinker->entries.begin(); metalinker->getEntries().begin();
SharedHandle<MetalinkEntry> entry1 = *entryItr; SharedHandle<MetalinkEntry> entry1 = *entryItr;
CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), entry1->getPath()); CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), entry1->getPath());
@ -608,8 +608,8 @@ void MetalinkProcessorTest::testParseFile_dirtraversal()
MetalinkProcessor proc; MetalinkProcessor proc;
SharedHandle<Metalinker> metalinker = SharedHandle<Metalinker> metalinker =
proc.parseFile("metalink3-dirtraversal.xml"); proc.parseFile("metalink3-dirtraversal.xml");
CPPUNIT_ASSERT_EQUAL((size_t)1, metalinker->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, metalinker->getEntries().size());
SharedHandle<MetalinkEntry> e = metalinker->entries[0]; SharedHandle<MetalinkEntry> e = metalinker->getEntries()[0];
CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.3.tar.bz2"), e->getPath()); CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.3.tar.bz2"), e->getPath());
CPPUNIT_ASSERT(!e->getSignature().isNull()); CPPUNIT_ASSERT(!e->getSignature().isNull());
CPPUNIT_ASSERT_EQUAL(std::string(""), e->getSignature()->getFile()); CPPUNIT_ASSERT_EQUAL(std::string(""), e->getSignature()->getFile());
@ -624,8 +624,8 @@ void MetalinkProcessorTest::testParseFromBinaryStream()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
std::vector<SharedHandle<MetalinkEntry> >::iterator entryItr = std::vector<SharedHandle<MetalinkEntry> >::const_iterator entryItr =
m->entries.begin(); m->getEntries().begin();
SharedHandle<MetalinkEntry> entry1 = *entryItr; SharedHandle<MetalinkEntry> entry1 = *entryItr;
CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), entry1->getPath()); CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), entry1->getPath());
} catch(Exception& e) { } catch(Exception& e) {
@ -704,8 +704,8 @@ void MetalinkProcessorTest::testBadSize()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
std::vector<SharedHandle<MetalinkEntry> >::iterator entryItr = std::vector<SharedHandle<MetalinkEntry> >::const_iterator entryItr =
m->entries.begin(); m->getEntries().begin();
SharedHandle<MetalinkEntry> e = *entryItr; SharedHandle<MetalinkEntry> e = *entryItr;
CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), e->getPath()); CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), e->getPath());
CPPUNIT_ASSERT_EQUAL((uint64_t)0ULL, e->getLength()); CPPUNIT_ASSERT_EQUAL((uint64_t)0ULL, e->getLength());
@ -737,8 +737,8 @@ void MetalinkProcessorTest::testBadMaxConn()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
std::vector<SharedHandle<MetalinkEntry> >::iterator entryItr = std::vector<SharedHandle<MetalinkEntry> >::const_iterator entryItr =
m->entries.begin(); m->getEntries().begin();
SharedHandle<MetalinkEntry> e = *entryItr; SharedHandle<MetalinkEntry> e = *entryItr;
CPPUNIT_ASSERT_EQUAL((uint64_t)43743838ULL, e->getLength()); CPPUNIT_ASSERT_EQUAL((uint64_t)43743838ULL, e->getLength());
} catch(Exception& e) { } catch(Exception& e) {
@ -769,9 +769,9 @@ void MetalinkProcessorTest::testNoName()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
std::vector<SharedHandle<MetalinkEntry> >::iterator entryItr = std::vector<SharedHandle<MetalinkEntry> >::const_iterator entryItr =
m->entries.begin(); m->getEntries().begin();
SharedHandle<MetalinkEntry> e = *entryItr; SharedHandle<MetalinkEntry> e = *entryItr;
CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), e->getPath()); CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.5.2.tar.bz2"), e->getPath());
} catch(Exception& e) { } catch(Exception& e) {
@ -800,7 +800,7 @@ void MetalinkProcessorTest::testBadURLPrefs()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->getEntries()[0];
SharedHandle<MetalinkResource> r = e->resources[0]; SharedHandle<MetalinkResource> r = e->resources[0];
CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_FTP, r->type); CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_FTP, r->type);
CPPUNIT_ASSERT_EQUAL(MetalinkResource::getLowestPriority(), r->priority); CPPUNIT_ASSERT_EQUAL(MetalinkResource::getLowestPriority(), r->priority);
@ -833,7 +833,7 @@ void MetalinkProcessorTest::testBadURLMaxConn()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->getEntries()[0];
SharedHandle<MetalinkResource> r = e->resources[0]; SharedHandle<MetalinkResource> r = e->resources[0];
CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_FTP, r->type); CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_FTP, r->type);
CPPUNIT_ASSERT_EQUAL(1, r->priority); CPPUNIT_ASSERT_EQUAL(1, r->priority);
@ -867,7 +867,7 @@ void MetalinkProcessorTest::testUnsupportedType()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->getEntries()[0];
CPPUNIT_ASSERT_EQUAL((size_t)3, e->resources.size()); CPPUNIT_ASSERT_EQUAL((size_t)3, e->resources.size());
SharedHandle<MetalinkResource> r1 = e->resources[0]; SharedHandle<MetalinkResource> r1 = e->resources[0];
CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_FTP, r1->type); CPPUNIT_ASSERT_EQUAL(MetalinkResource::TYPE_FTP, r1->type);
@ -900,7 +900,7 @@ void MetalinkProcessorTest::testMultiplePieces()
try { try {
// aria2 prefers sha1 // aria2 prefers sha1
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->getEntries()[0];
SharedHandle<ChunkChecksum> c = e->chunkChecksum; SharedHandle<ChunkChecksum> c = e->chunkChecksum;
CPPUNIT_ASSERT_EQUAL(MessageDigestContext::SHA1, c->getAlgo()); CPPUNIT_ASSERT_EQUAL(MessageDigestContext::SHA1, c->getAlgo());
@ -933,7 +933,7 @@ void MetalinkProcessorTest::testBadPieceNo()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->getEntries()[0];
SharedHandle<ChunkChecksum> c = e->chunkChecksum; SharedHandle<ChunkChecksum> c = e->chunkChecksum;
CPPUNIT_ASSERT(!c.isNull()); CPPUNIT_ASSERT(!c.isNull());
@ -966,8 +966,8 @@ void MetalinkProcessorTest::testBadPieceLength()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->getEntries()[0];
SharedHandle<ChunkChecksum> c = e->chunkChecksum; SharedHandle<ChunkChecksum> c = e->chunkChecksum;
CPPUNIT_ASSERT(!c.isNull()); CPPUNIT_ASSERT(!c.isNull());
CPPUNIT_ASSERT_EQUAL((size_t)1024, c->getChecksumLength()); CPPUNIT_ASSERT_EQUAL((size_t)1024, c->getChecksumLength());
@ -999,7 +999,7 @@ void MetalinkProcessorTest::testUnsupportedType_piece()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->getEntries()[0];
SharedHandle<ChunkChecksum> c = e->chunkChecksum; SharedHandle<ChunkChecksum> c = e->chunkChecksum;
CPPUNIT_ASSERT(!c.isNull()); CPPUNIT_ASSERT(!c.isNull());
@ -1028,7 +1028,7 @@ void MetalinkProcessorTest::testLargeFileSize()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->getEntries()[0];
CPPUNIT_ASSERT_EQUAL((uint64_t)9223372036854775807ULL, e->getLength()); CPPUNIT_ASSERT_EQUAL((uint64_t)9223372036854775807ULL, e->getLength());
} catch(Exception& e) { } catch(Exception& e) {
CPPUNIT_FAIL(e.stackTrace()); CPPUNIT_FAIL(e.stackTrace());
@ -1052,8 +1052,8 @@ void MetalinkProcessorTest::testXmlPrefixV3()
try { try {
SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw); SharedHandle<Metalinker> m = proc.parseFromBinaryStream(dw);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getEntries().size());
SharedHandle<MetalinkEntry> e = m->entries[0]; SharedHandle<MetalinkEntry> e = m->getEntries()[0];
CPPUNIT_ASSERT_EQUAL((uint64_t)9223372036854775807ULL, e->getLength()); CPPUNIT_ASSERT_EQUAL((uint64_t)9223372036854775807ULL, e->getLength());
} catch(Exception& e) { } catch(Exception& e) {
CPPUNIT_FAIL(e.stackTrace()); CPPUNIT_FAIL(e.stackTrace());

4
test/MetalinkerTest.cc
View File

@ -35,8 +35,8 @@ void MetalinkerTest::testQueryEntry() {
entry2->version = "0.5.1"; entry2->version = "0.5.1";
entry2->languages.push_back("ja-JP"); entry2->languages.push_back("ja-JP");
entry2->oses.push_back("Linux-m68k"); entry2->oses.push_back("Linux-m68k");
metalinker->entries.push_back(entry1); metalinker->addEntry(entry1);
metalinker->entries.push_back(entry2); metalinker->addEntry(entry2);
std::string version; std::string version;
std::string language; std::string language;