mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-04 21:17:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

2009-12-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Browse source 
Added following 2 keys, followedBy and belongsTo, to the response
	of tellStatus.

	followedBy: List of GIDs which are generated by the consequence of
	this download. For example, when aria2 downloaded Metalink file,
	it generates downloads described in it(see *--follow-metalink*
	option). This value is useful to track these auto generated
	downloads. If there is no such downloads, this key will not be
	included in the response.

	belongsTo: GID of a parent download. Some downloads are a part of
	another download.  For example, if a file in Metalink has
	BitTorrent resource, the download of .torrent is a part of that
	file.  If this download has no parent, this key will not be
	included in the response.
	* src/BtPostDownloadHandler.cc
	* src/DownloadResult.h
	* src/Metalink2RequestGroup.cc
	* src/MetalinkPostDownloadHandler.cc
	* src/RequestGroup.cc
	* src/RequestGroup.h
	* src/UTMetadataPostDownloadHandler.cc
	* src/XmlRpcMethodImpl.cc
	* src/XmlRpcMethodImpl.h
This commit is contained in:
Tatsuhiro Tsujikawa 2009-12-20 09:49:43 +00:00
parent 7c12d43a42
commit 2952abf064
13 changed files with 176 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

52
test/XmlRpcMethodTest.cc
View file

@ -18,6 +18,7 @@
#include "TestUtil.h"
#include "DownloadContext.h"
#include "FeatureConfig.h"
#include "util.h"
#ifdef ENABLE_BITTORRENT
# include "BtRegistry.h"
# include "BtRuntime.h"
@ -64,6 +65,8 @@ class XmlRpcMethodTest:public CppUnit::TestFixture {
CPPUNIT_TEST(testTellWaiting_fail);
CPPUNIT_TEST(testGetVersion);
CPPUNIT_TEST(testNoSuchMethod);
CPPUNIT_TEST(testGatherStoppedDownload);
CPPUNIT_TEST(testGatherProgressCommon);
CPPUNIT_TEST_SUITE_END();
private:
SharedHandle<DownloadEngine> _e;
@ -114,6 +117,8 @@ public:
void testTellWaiting_fail();
void testGetVersion();
void testNoSuchMethod();
void testGatherStoppedDownload();
void testGatherProgressCommon();
};
@ -624,6 +629,53 @@ void XmlRpcMethodTest::testGetVersion()
features);
}
void XmlRpcMethodTest::testGatherStoppedDownload()
{
std::vector<SharedHandle<FileEntry> > fileEntries;
std::vector<int32_t> followedBy;
followedBy.push_back(3);
followedBy.push_back(4);
SharedHandle<DownloadResult> d
(new DownloadResult(1,
fileEntries,
false,
UINT64_MAX,
1000,
downloadresultcode::FINISHED,
followedBy,
2));
BDE entry = BDE::dict();
gatherStoppedDownload(entry, d);
CPPUNIT_ASSERT_EQUAL(std::string("3"), entry["followedBy"][0].s());
CPPUNIT_ASSERT_EQUAL(std::string("4"), entry["followedBy"][1].s());
CPPUNIT_ASSERT_EQUAL(std::string("2"), entry["belongsTo"].s());
}
void XmlRpcMethodTest::testGatherProgressCommon()
{
SharedHandle<DownloadContext> dctx(new DownloadContext());
SharedHandle<RequestGroup> group(new RequestGroup(_option));
group->setDownloadContext(dctx);
std::vector<SharedHandle<RequestGroup> > followedBy;
for(int i = 0; i < 2; ++i) {
followedBy.push_back(SharedHandle<RequestGroup>(new RequestGroup(_option)));
}
group->followedBy(followedBy.begin(), followedBy.end());
group->belongsTo(2);
BDE entry = BDE::dict();
gatherProgressCommon(entry, group);
CPPUNIT_ASSERT_EQUAL(util::itos(followedBy[0]->getGID()),
entry["followedBy"][0].s());
CPPUNIT_ASSERT_EQUAL(util::itos(followedBy[1]->getGID()),
entry["followedBy"][1].s());
CPPUNIT_ASSERT_EQUAL(std::string("2"), entry["belongsTo"].s());
}
} // namespace xmlrpc
} // namespace aria2