summaryrefslogtreecommitdiff
path: root/test/DefaultBtProgressInfoFileTest.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2009-03-09 15:10:26 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2009-03-09 15:10:26 +0000
commite2704bd823e44000b81e42fc05b58b8d0bc9ddda (patch)
tree4f9a5a0299521877e03bff090bdbc80ba43486c3 /test/DefaultBtProgressInfoFileTest.cc
parented6851636f38a1959186b92b1c619c4706ad4cca (diff)
2009-03-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
FileEntry::getPath() contains store(top level) directory to simplify path handling operation. In the previous implementation, store directory is concatenated to FileEntry::getPath() in DownloadContext. * src/BtDependency.cc * src/BtPostDownloadHandler.cc * src/CopyDiskAdaptor.cc * src/DefaultBtContext.cc * src/DirectDiskAdaptor.cc * src/FileEntry.cc * src/FileEntry.h * src/FtpNegotiationCommand.cc * src/HttpResponse.cc * src/HttpResponseCommand.cc * src/Metalink2RequestGroup.cc * src/MultiDiskAdaptor.cc * src/MultiDiskAdaptor.h * src/MultiFileAllocationIterator.cc * src/RequestGroup.cc * src/SingleFileDownloadContext.cc * src/SingleFileDownloadContext.h * src/download_helper.cc * test/BtDependencyTest.cc * test/CopyDiskAdaptorTest.cc * test/DefaultBtContextTest.cc * test/DefaultBtProgressInfoFileTest.cc * test/DirectDiskAdaptorTest.cc * test/DownloadHelperTest.cc * test/FileEntryTest.cc * test/MultiDiskAdaptorTest.cc * test/MultiFileAllocationIteratorTest.cc * test/RequestGroupTest.cc * test/SingleFileDownloadContextTest.cc
Diffstat (limited to 'test/DefaultBtProgressInfoFileTest.cc')
-rw-r--r--test/DefaultBtProgressInfoFileTest.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/test/DefaultBtProgressInfoFileTest.cc b/test/DefaultBtProgressInfoFileTest.cc
index 727027f8..2c8d45e4 100644
--- a/test/DefaultBtProgressInfoFileTest.cc
+++ b/test/DefaultBtProgressInfoFileTest.cc
@@ -70,6 +70,7 @@ public:
_btContext.reset(new MockBtContext());
_btContext->setInfoHash(infoHash);
+ _btContext->setDir(_option->get(PREF_DIR));
_peerStorage.reset(new MockPeerStorage());
_btRuntime.reset(new BtRuntime());
#endif // ENABLE_BITTORRENT
@@ -332,7 +333,7 @@ void DefaultBtProgressInfoFileTest::testLoad_nonBt_compat()
initializeMembers(1024, 81920);
SharedHandle<SingleFileDownloadContext> dctx
- (new SingleFileDownloadContext(1024, 81920, "load-nonBt"));
+ (new SingleFileDownloadContext(1024, 81920, "./load-nonBt"));
DefaultBtProgressInfoFile infoFile(dctx, _pieceStorage, _option.get());
@@ -377,7 +378,7 @@ void DefaultBtProgressInfoFileTest::testLoad_nonBt()
initializeMembers(1024, 81920);
SharedHandle<SingleFileDownloadContext> dctx
- (new SingleFileDownloadContext(1024, 81920, "load-nonBt-v0001"));
+ (new SingleFileDownloadContext(1024, 81920, "./load-nonBt-v0001"));
DefaultBtProgressInfoFile infoFile(dctx, _pieceStorage, _option.get());
@@ -422,7 +423,7 @@ void DefaultBtProgressInfoFileTest::testLoad_nonBt_pieceLengthShorter()
_option->put(PREF_ALLOW_PIECE_LENGTH_CHANGE, V_TRUE);
SharedHandle<SingleFileDownloadContext> dctx
- (new SingleFileDownloadContext(512, 81920, "load-nonBt-v0001"));
+ (new SingleFileDownloadContext(512, 81920, "./load-nonBt-v0001"));
DefaultBtProgressInfoFile infoFile(dctx, _pieceStorage, _option.get());
@@ -447,7 +448,7 @@ void DefaultBtProgressInfoFileTest::testSave_nonBt()
initializeMembers(1024, 81920);
SharedHandle<SingleFileDownloadContext> dctx
- (new SingleFileDownloadContext(1024, 81920, "save-temp"));
+ (new SingleFileDownloadContext(1024, 81920, "./save-temp"));
_bitfield->setAllBit();
_bitfield->unsetBit(79);
@@ -554,7 +555,7 @@ void DefaultBtProgressInfoFileTest::testSave_nonBt()
void DefaultBtProgressInfoFileTest::testUpdateFilename()
{
SharedHandle<SingleFileDownloadContext> dctx
- (new SingleFileDownloadContext(1024, 81920, "file1"));
+ (new SingleFileDownloadContext(1024, 81920, "./file1"));
DefaultBtProgressInfoFile infoFile(dctx, SharedHandle<MockPieceStorage>(), 0);
#ifdef ENABLE_BITTORRENT
@@ -564,7 +565,7 @@ void DefaultBtProgressInfoFileTest::testUpdateFilename()
CPPUNIT_ASSERT_EQUAL(std::string("./file1.aria2"), infoFile.getFilename());
- dctx->setUFilename("file1.1");
+ dctx->setUFilename("./file1.1");
CPPUNIT_ASSERT_EQUAL(std::string("./file1.aria2"), infoFile.getFilename());