summaryrefslogtreecommitdiff
path: root/test/BittorrentHelperTest.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2011-10-29 23:33:48 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2011-10-29 23:33:48 +0900
commit5749647ae5559098cb077d35b496eb3fd15b579d (patch)
treedc6d9e4eec8ba5d6a328dcd5eced0b0694264cff /test/BittorrentHelperTest.cc
parent78c3bcd199bfe9113e2a17299d008d7fa464f38a (diff)
Use SegList<int> instead of IntSequence in DownloadContext::setFileFilter()
Diffstat (limited to 'test/BittorrentHelperTest.cc')
-rw-r--r--test/BittorrentHelperTest.cc26
1 files changed, 18 insertions, 8 deletions
diff --git a/test/BittorrentHelperTest.cc b/test/BittorrentHelperTest.cc
index 832e1997..c2ce9c9e 100644
--- a/test/BittorrentHelperTest.cc
+++ b/test/BittorrentHelperTest.cc
@@ -645,16 +645,20 @@ void BittorrentHelperTest::testSetFileFilter_single()
load(A2_TEST_DIR"/single.torrent", dctx, option_);
CPPUNIT_ASSERT(dctx->getFirstFileEntry()->isRequested());
-
- dctx->setFileFilter(util::parseIntRange(""));
+ SegList<int> sgl;
+ dctx->setFileFilter(sgl);
CPPUNIT_ASSERT(dctx->getFirstFileEntry()->isRequested());
- dctx->setFileFilter(util::parseIntRange("1"));
+ sgl.clear();
+ sgl.add(1, 2);
+ dctx->setFileFilter(sgl);
CPPUNIT_ASSERT(dctx->getFirstFileEntry()->isRequested());
// For single file torrent, file is always selected whatever range
// is passed.
- dctx->setFileFilter(util::parseIntRange("2"));
+ sgl.clear();
+ sgl.add(2, 3);
+ dctx->setFileFilter(sgl);
CPPUNIT_ASSERT(dctx->getFirstFileEntry()->isRequested());
}
@@ -666,19 +670,25 @@ void BittorrentHelperTest::testSetFileFilter_multi()
CPPUNIT_ASSERT(dctx->getFileEntries()[0]->isRequested());
CPPUNIT_ASSERT(dctx->getFileEntries()[1]->isRequested());
- dctx->setFileFilter(util::parseIntRange(""));
+ SegList<int> sgl;
+ dctx->setFileFilter(sgl);
CPPUNIT_ASSERT(dctx->getFileEntries()[0]->isRequested());
CPPUNIT_ASSERT(dctx->getFileEntries()[1]->isRequested());
- dctx->setFileFilter(util::parseIntRange("2"));
+ sgl.add(2, 3);
+ dctx->setFileFilter(sgl);
CPPUNIT_ASSERT(!dctx->getFileEntries()[0]->isRequested());
CPPUNIT_ASSERT(dctx->getFileEntries()[1]->isRequested());
- dctx->setFileFilter(util::parseIntRange("3"));
+ sgl.clear();
+ sgl.add(3, 4);
+ dctx->setFileFilter(sgl);
CPPUNIT_ASSERT(!dctx->getFileEntries()[0]->isRequested());
CPPUNIT_ASSERT(!dctx->getFileEntries()[1]->isRequested());
- dctx->setFileFilter(util::parseIntRange("1,2"));
+ sgl.clear();
+ util::parseIntSegments(sgl, "1,2");
+ dctx->setFileFilter(sgl);
CPPUNIT_ASSERT(dctx->getFileEntries()[0]->isRequested());
CPPUNIT_ASSERT(dctx->getFileEntries()[1]->isRequested());
}