diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-03-07 15:37:18 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-03-07 15:37:18 +0000 |
| commit | 5f376f3c60855d5a4cd2e64ca7c97f0870ca71f2 (patch) | |
| tree | 3750db30025f90d67ea81e20b774c1f4aa10d71a | |
| parent | 49169c93bada98af5b0693c2429ff1110ee86bc8 (diff) | |
2010-03-08 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed compile error with --disable-bittorrent
* test/Metalink2RequestGroupTest.cc
* test/MetalinkParserControllerTest.cc
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/Metalink2RequestGroupTest.cc | 26 | ||||
| -rw-r--r-- | test/MetalinkParserControllerTest.cc | 8 |
3 files changed, 40 insertions, 0 deletions
@@ -1,5 +1,11 @@ 2010-03-08 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> + Fixed compile error with --disable-bittorrent + * test/Metalink2RequestGroupTest.cc + * test/MetalinkParserControllerTest.cc + +2010-03-08 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> + Added --reuse-uri option. This option has existed quite long, but been hidden. * doc/aria2c.1.txt diff --git a/test/Metalink2RequestGroupTest.cc b/test/Metalink2RequestGroupTest.cc index 8b0b9363..2cecb4aa 100644 --- a/test/Metalink2RequestGroupTest.cc +++ b/test/Metalink2RequestGroupTest.cc @@ -129,6 +129,8 @@ void Metalink2RequestGroupTest::testGenerate_groupByMetaurl() Metalink2RequestGroup().generate(groups, "metalink4-groupbymetaurl.xml", _option); CPPUNIT_ASSERT_EQUAL((size_t)3, groups.size()); + +#ifdef ENABLE_BITTORRENT // first RequestGroup is torrent for second RequestGroup { SharedHandle<RequestGroup> rg = groups[0]; @@ -167,6 +169,30 @@ void Metalink2RequestGroupTest::testGenerate_groupByMetaurl() CPPUNIT_ASSERT_EQUAL(std::string("http://file2p1"), fileEntries[0]->getRemainingUris()[0]); } +#else // !ENABLE_BITTORRENT + { + SharedHandle<RequestGroup> rg = groups[0]; + std::vector<std::string> uris; + rg->getDownloadContext()->getFirstFileEntry()->getUris(uris); + CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size()); + CPPUNIT_ASSERT_EQUAL(std::string("http://file1p1"), uris[0]); + } + { + SharedHandle<RequestGroup> rg = groups[1]; + std::vector<std::string> uris; + rg->getDownloadContext()->getFirstFileEntry()->getUris(uris); + CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size()); + CPPUNIT_ASSERT_EQUAL(std::string("http://file2p1"), uris[0]); + } + { + SharedHandle<RequestGroup> rg = groups[2]; + std::vector<std::string> uris; + rg->getDownloadContext()->getFirstFileEntry()->getUris(uris); + CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size()); + CPPUNIT_ASSERT_EQUAL(std::string("http://file3p1"), uris[0]); + } + +#endif // !ENABLE_BITTORRENT } } // namespace aria2 diff --git a/test/MetalinkParserControllerTest.cc b/test/MetalinkParserControllerTest.cc index 904ccc22..110ebd65 100644 --- a/test/MetalinkParserControllerTest.cc +++ b/test/MetalinkParserControllerTest.cc @@ -120,6 +120,7 @@ void MetalinkParserControllerTest::testMetaurlTransaction() ctrl.setPriorityOfMetaurl(999); ctrl.setNameOfMetaurl("mybirthdaycake"); ctrl.commitEntryTransaction(); +#ifdef ENABLE_BITTORRENT { SharedHandle<Metalinker> m = ctrl.getResult(); CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); @@ -141,6 +142,13 @@ void MetalinkParserControllerTest::testMetaurlTransaction() CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries[0]->metaurls.size()); CPPUNIT_ASSERT_EQUAL((size_t)0, m->entries[1]->metaurls.size()); } +#else // !ENABLE_BITTORRENT + { + SharedHandle<Metalinker> m = ctrl.getResult(); + CPPUNIT_ASSERT_EQUAL((size_t)1, m->entries.size()); + CPPUNIT_ASSERT_EQUAL((size_t)0, m->entries[0]->metaurls.size()); + } +#endif // !ENABLE_BITTORRENT } #ifdef ENABLE_MESSAGE_DIGEST |