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

11 files changed, 110 insertions, 131 deletions

diff --git a/test/BtDependencyTest.cc b/test/BtDependencyTest.cc
index 2f192935..3e5efd51 100644
--- a/test/BtDependencyTest.cc
+++ b/test/BtDependencyTest.cc
@@ -29,7 +29,7 @@ class BtDependencyTest:public CppUnit::TestFixture {
   {
     SharedHandle<RequestGroup> dependant(new RequestGroup(option, std::deque<std::string>()));
     SharedHandle<SingleFileDownloadContext> dctx
-      (new SingleFileDownloadContext(0, 0, "outfile.path"));
+      (new SingleFileDownloadContext(0, 0, "/tmp/outfile.path"));
     dctx->setDir("/tmp");
     dependant->setDownloadContext(dctx);
     return dependant;
diff --git a/test/CopyDiskAdaptorTest.cc b/test/CopyDiskAdaptorTest.cc
index 172c4397..e4bfaa76 100644
--- a/test/CopyDiskAdaptorTest.cc
+++ b/test/CopyDiskAdaptorTest.cc
@@ -28,22 +28,19 @@ CPPUNIT_TEST_SUITE_REGISTRATION( CopyDiskAdaptorTest );
 
 void CopyDiskAdaptorTest::testUtime()
 {
-  std::string storeDir = "/tmp";
-  std::string topDir = "aria2_CopyDiskAdaptorTest_testUtime";
-  std::string prefix = storeDir+"/"+topDir;
+  std::string storeDir = "/tmp/aria2_CopyDiskAdaptorTest_testUtime";
   SharedHandle<FileEntry> entries[] = {
-    SharedHandle<FileEntry>(new FileEntry("requested", 10, 0)),
-    SharedHandle<FileEntry>(new FileEntry("notFound", 10, 10)),
-    SharedHandle<FileEntry>(new FileEntry("notRequested", 10, 20)),
-    SharedHandle<FileEntry>(new FileEntry("notExtracted", 10, 30)),
-    SharedHandle<FileEntry>(new FileEntry("anotherRequested", 10, 40)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/requested", 10, 0)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/notFound", 10, 10)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/notRequested", 10, 20)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/notExtracted", 10, 30)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/anotherRequested", 10, 40)),
   };
 
   std::deque<SharedHandle<FileEntry> > fileEntries
     (&entries[0], &entries[arrayLength(entries)]);
   CopyDiskAdaptor adaptor;
   adaptor.setStoreDir(storeDir);
-  adaptor.setTopDir(topDir);
   adaptor.setFileEntries(fileEntries);
 
   entries[0]->setExtracted(true);
@@ -53,11 +50,11 @@ void CopyDiskAdaptorTest::testUtime()
   
   entries[2]->setRequested(false);
 
-  createFile(prefix+"/"+entries[0]->getPath(), entries[0]->getLength());
-  File(prefix+"/"+entries[1]->getPath()).remove();
-  createFile(prefix+"/"+entries[2]->getPath(), entries[2]->getLength());
-  createFile(prefix+"/"+entries[3]->getPath(), entries[3]->getLength());
-  createFile(prefix+"/"+entries[4]->getPath(), entries[4]->getLength());
+  createFile(entries[0]->getPath(), entries[0]->getLength());
+  File(entries[1]->getPath()).remove();
+  createFile(entries[2]->getPath(), entries[2]->getLength());
+  createFile(entries[3]->getPath(), entries[3]->getLength());
+  createFile(entries[4]->getPath(), entries[4]->getLength());
 
   time_t atime = (time_t) 100000;
   time_t mtime = (time_t) 200000;
@@ -65,19 +62,17 @@ void CopyDiskAdaptorTest::testUtime()
   CPPUNIT_ASSERT_EQUAL((size_t)2, adaptor.utime(Time(atime), Time(mtime)));
   
   CPPUNIT_ASSERT_EQUAL((time_t)mtime,
-		       File(prefix+"/"+entries[0]->getPath())
-		       .getModifiedTime().getTime());
+		       File(entries[0]->getPath()).getModifiedTime().getTime());
 
   CPPUNIT_ASSERT_EQUAL((time_t)mtime,
-		       File(prefix+"/"+entries[4]->getPath())
-		       .getModifiedTime().getTime());
-
-  CPPUNIT_ASSERT((time_t)mtime != File(prefix+"/"+entries[1]->getPath())
-		 .getModifiedTime().getTime());
-  CPPUNIT_ASSERT((time_t)mtime != File(prefix+"/"+entries[2]->getPath())
-		 .getModifiedTime().getTime());
-  CPPUNIT_ASSERT((time_t)mtime != File(prefix+"/"+entries[3]->getPath())
-		 .getModifiedTime().getTime());
+		       File(entries[4]->getPath()).getModifiedTime().getTime());
+
+  CPPUNIT_ASSERT((time_t)mtime !=
+		 File(entries[1]->getPath()).getModifiedTime().getTime());
+  CPPUNIT_ASSERT((time_t)mtime !=
+		 File(entries[2]->getPath()).getModifiedTime().getTime());
+  CPPUNIT_ASSERT((time_t)mtime !=
+		 File(entries[3]->getPath()).getModifiedTime().getTime());
 
 }
 
diff --git a/test/DefaultBtContextTest.cc b/test/DefaultBtContextTest.cc
index dd0ad2b5..c69da648 100644
--- a/test/DefaultBtContextTest.cc
+++ b/test/DefaultBtContextTest.cc
@@ -126,7 +126,7 @@ void DefaultBtContextTest::testGetFileEntriesSingle() {
   std::deque<SharedHandle<FileEntry> >::iterator itr = fileEntries.begin();
 
   SharedHandle<FileEntry> fileEntry1 = *itr;
-  CPPUNIT_ASSERT_EQUAL(std::string("aria2-0.8.2.tar.bz2"),
+  CPPUNIT_ASSERT_EQUAL(std::string("./aria2-0.8.2.tar.bz2"),
 		       fileEntry1->getPath());
 }
 
@@ -319,7 +319,7 @@ void DefaultBtContextTest::testGetFileEntries_singleFileUrlList() {
   CPPUNIT_ASSERT_EQUAL((size_t)1, fileEntries.size());
 
   SharedHandle<FileEntry> fileEntry1 = fileEntries.front();
-  CPPUNIT_ASSERT_EQUAL(std::string("aria2.tar.bz2"),
+  CPPUNIT_ASSERT_EQUAL(std::string("./aria2.tar.bz2"),
 		       fileEntry1->getPath());
   std::deque<std::string> uris1 = fileEntry1->getAssociatedUris();
   CPPUNIT_ASSERT_EQUAL((size_t)1, uris1.size());
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());
 
diff --git a/test/DirectDiskAdaptorTest.cc b/test/DirectDiskAdaptorTest.cc
index b5254008..ce67912c 100644
--- a/test/DirectDiskAdaptorTest.cc
+++ b/test/DirectDiskAdaptorTest.cc
@@ -29,9 +29,9 @@ void DirectDiskAdaptorTest::testCutTrailingGarbage()
 {
   std::string dir = "/tmp";
   SharedHandle<FileEntry> entry
-    (new FileEntry("aria2_DirectDiskAdaptorTest_testCutTrailingGarbage",
+    (new FileEntry(dir+"/aria2_DirectDiskAdaptorTest_testCutTrailingGarbage",
 		   256, 0));
-  createFile(dir+"/"+entry->getPath(), entry->getLength()+100);
+  createFile(entry->getPath(), entry->getLength()+100);
 
   std::deque<SharedHandle<FileEntry> > fileEntries;
   fileEntries.push_back(entry);
@@ -46,7 +46,7 @@ void DirectDiskAdaptorTest::testCutTrailingGarbage()
   adaptor.cutTrailingGarbage();
 
   CPPUNIT_ASSERT_EQUAL((uint64_t)entry->getLength(),
-		       File(dir+"/"+entry->getPath()).size());
+		       File(entry->getPath()).size());
 }
 
 } // namespace aria2
diff --git a/test/DownloadHelperTest.cc b/test/DownloadHelperTest.cc
index 71e9b1ee..e8f3744f 100644
--- a/test/DownloadHelperTest.cc
+++ b/test/DownloadHelperTest.cc
@@ -144,11 +144,8 @@ void DownloadHelperTest::testCreateRequestGroupForUri()
 			 alphaGroup->getNumConcurrentCommand());
     SharedHandle<DownloadContext> alphaCtx = alphaGroup->getDownloadContext();
     CPPUNIT_ASSERT_EQUAL(std::string("/tmp"), alphaCtx->getDir());
-    // See the value of PREF_OUT is not used as a file name.
-    CPPUNIT_ASSERT_EQUAL(std::string("/tmp/index.html"),
-			 alphaCtx->getActualBasePath());
-
-
+    // See filename is not assigned yet
+    CPPUNIT_ASSERT_EQUAL(std::string(""), alphaCtx->getActualBasePath());
   }
 }
 
diff --git a/test/FileEntryTest.cc b/test/FileEntryTest.cc
index 5b6465bc..5c3f70f6 100644
--- a/test/FileEntryTest.cc
+++ b/test/FileEntryTest.cc
@@ -19,17 +19,16 @@ CPPUNIT_TEST_SUITE_REGISTRATION( FileEntryTest );
 
 void FileEntryTest::testSetupDir()
 {
-  std::string topDir = "/tmp";
-  std::string dir = "aria2-FileEntryTest-testSetupDir";
+  std::string dir = "/tmp/aria2-FileEntryTest-testSetupDir";
   std::string filename = "filename";
-  std::string path = topDir+"/"+dir+"/"+filename;
-  File d(topDir+"/"+dir);
+  std::string path = dir+"/"+filename;
+  File d(dir);
   if(d.exists()) {
     CPPUNIT_ASSERT(d.remove());
   }
   CPPUNIT_ASSERT(!d.exists());
-  FileEntry fileEntry(dir+"/"+filename, 0, 0);
-  fileEntry.setupDir(topDir);
+  FileEntry fileEntry(path, 0, 0);
+  fileEntry.setupDir();
   CPPUNIT_ASSERT(d.isDir());
   File f(path);
   CPPUNIT_ASSERT(!f.exists());
diff --git a/test/MultiDiskAdaptorTest.cc b/test/MultiDiskAdaptorTest.cc
index bc7498a2..83c282aa 100644
--- a/test/MultiDiskAdaptorTest.cc
+++ b/test/MultiDiskAdaptorTest.cc
@@ -373,23 +373,19 @@ void MultiDiskAdaptorTest::testReadData() {
 void MultiDiskAdaptorTest::testCutTrailingGarbage()
 {
   std::string dir = "/tmp";
-  std::string topDir = ".";
-  std::string topDirPath = dir+"/"+topDir;
   std::string prefix = "aria2_MultiDiskAdaptorTest_testCutTrailingGarbage_";
   SharedHandle<FileEntry> entries[] = {
-    SharedHandle<FileEntry>(new FileEntry(prefix+"1", 256, 0)),
-    SharedHandle<FileEntry>(new FileEntry(prefix+"2", 512, 256))
+    SharedHandle<FileEntry>(new FileEntry(dir+"/"+prefix+"1", 256, 0)),
+    SharedHandle<FileEntry>(new FileEntry(dir+"/"+prefix+"2", 512, 256))
   };
   for(size_t i = 0; i < arrayLength(entries); ++i) {
-    createFile(topDirPath+"/"+entries[i]->getPath(),
-	       entries[i]->getLength()+100);
+    createFile(entries[i]->getPath(), entries[i]->getLength()+100);
   }
   std::deque<SharedHandle<FileEntry> > fileEntries
     (&entries[0], &entries[arrayLength(entries)]);
   
   MultiDiskAdaptor adaptor;
   adaptor.setStoreDir(dir);
-  adaptor.setTopDir(topDir);
   adaptor.setFileEntries(fileEntries);
   adaptor.setMaxOpenFiles(1);
   adaptor.setPieceLength(1);
@@ -399,30 +395,27 @@ void MultiDiskAdaptorTest::testCutTrailingGarbage()
   adaptor.cutTrailingGarbage();
 
   CPPUNIT_ASSERT_EQUAL((uint64_t)256,
-		       File(topDirPath+"/"+entries[0]->getPath()).size());
+		       File(entries[0]->getPath()).size());
   CPPUNIT_ASSERT_EQUAL((uint64_t)512,
-		       File(topDirPath+"/"+entries[1]->getPath()).size());
+		       File(entries[1]->getPath()).size());
 }
 
 void MultiDiskAdaptorTest::testSize()
 {
   std::string dir = "/tmp";
-  std::string topDir = ".";
-  std::string topDirPath = dir+"/"+topDir;
   std::string prefix = "aria2_MultiDiskAdaptorTest_testSize_";
   SharedHandle<FileEntry> entries[] = {
-    SharedHandle<FileEntry>(new FileEntry(prefix+"1", 1, 0)),
-    SharedHandle<FileEntry>(new FileEntry(prefix+"2", 1, 1))
+    SharedHandle<FileEntry>(new FileEntry(dir+"/"+prefix+"1", 1, 0)),
+    SharedHandle<FileEntry>(new FileEntry(dir+"/"+prefix+"2", 1, 1))
   };
   for(size_t i = 0; i < arrayLength(entries); ++i) {
-    createFile(topDirPath+"/"+entries[i]->getPath(), entries[i]->getLength());
+    createFile(entries[i]->getPath(), entries[i]->getLength());
   }
   std::deque<SharedHandle<FileEntry> > fileEntries
     (&entries[0], &entries[arrayLength(entries)]);
   
   MultiDiskAdaptor adaptor;
   adaptor.setStoreDir(dir);
-  adaptor.setTopDir(topDir);
   adaptor.setFileEntries(fileEntries);
   adaptor.setMaxOpenFiles(1);
   adaptor.setPieceLength(1);
@@ -436,16 +429,16 @@ void MultiDiskAdaptorTest::testUtime()
 {
   std::string storeDir = "/tmp/aria2_MultiDiskAdaptorTest_testUtime";
   SharedHandle<FileEntry> entries[] = {
-    SharedHandle<FileEntry>(new FileEntry("requested", 0, 0)),
-    SharedHandle<FileEntry>(new FileEntry("notFound", 0, 0)),
-    SharedHandle<FileEntry>(new FileEntry("notRequested", 0, 0)),
-    SharedHandle<FileEntry>(new FileEntry("anotherRequested", 0, 0)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/requested", 0, 0)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/notFound", 0, 0)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/notRequested", 0, 0)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/anotherRequested", 0, 0)),
   };
 
-  createFile(storeDir+"/"+entries[0]->getPath(), entries[0]->getLength());
-  File(storeDir+"/"+entries[1]->getPath()).remove();
-  createFile(storeDir+"/"+entries[2]->getPath(), entries[2]->getLength());
-  createFile(storeDir+"/"+entries[3]->getPath(), entries[3]->getLength());
+  createFile(entries[0]->getPath(), entries[0]->getLength());
+  File(entries[1]->getPath()).remove();
+  createFile(entries[2]->getPath(), entries[2]->getLength());
+  createFile(entries[3]->getPath(), entries[3]->getLength());
 
   entries[2]->setRequested(false);
 
@@ -461,15 +454,13 @@ void MultiDiskAdaptorTest::testUtime()
   CPPUNIT_ASSERT_EQUAL((size_t)2, adaptor.utime(Time(atime), Time(mtime)));
   
   CPPUNIT_ASSERT_EQUAL((time_t)mtime,
-		       File(storeDir+"/"+entries[0]->getPath())
-		       .getModifiedTime().getTime());
+		       File(entries[0]->getPath()).getModifiedTime().getTime());
 
   CPPUNIT_ASSERT_EQUAL((time_t)mtime,
-		       File(storeDir+"/"+entries[3]->getPath())
-		       .getModifiedTime().getTime());
+		       File(entries[3]->getPath()).getModifiedTime().getTime());
 
-  CPPUNIT_ASSERT((time_t)mtime != File(storeDir+"/"+entries[2]->getPath())
-		 .getModifiedTime().getTime());
+  CPPUNIT_ASSERT((time_t)mtime !=
+		 File(entries[2]->getPath()).getModifiedTime().getTime());
 }
 
 } // namespace aria2
diff --git a/test/MultiFileAllocationIteratorTest.cc b/test/MultiFileAllocationIteratorTest.cc
index 90c7e74c..822d838a 100644
--- a/test/MultiFileAllocationIteratorTest.cc
+++ b/test/MultiFileAllocationIteratorTest.cc
@@ -35,18 +35,21 @@ CPPUNIT_TEST_SUITE_REGISTRATION( MultiFileAllocationIteratorTest );
 
 void MultiFileAllocationIteratorTest::testMakeDiskWriterEntries()
 {
+  std::string storeDir = "/tmp/aria2_MultiFileAllocationIteratorTest"
+    "_testMakeDiskWriterEntries";
+
   SharedHandle<FileEntry> fs[] = {
-    SharedHandle<FileEntry>(new FileEntry("file1", 1536, 0)),
-    SharedHandle<FileEntry>(new FileEntry("file2", 2048, 1536)),// req no
-    SharedHandle<FileEntry>(new FileEntry("file3", 1024, 3584)),
-    SharedHandle<FileEntry>(new FileEntry("file4", 1024, 4608)),// req no
-    SharedHandle<FileEntry>(new FileEntry("file5", 1024, 5632)),// req no
-    SharedHandle<FileEntry>(new FileEntry("file6", 1024, 6656)),// req no
-    SharedHandle<FileEntry>(new FileEntry("file7",  256, 7680)),// req no
-    SharedHandle<FileEntry>(new FileEntry("file8",  255, 7936)),
-    SharedHandle<FileEntry>(new FileEntry("file9", 1025, 8191)),// req no
-    SharedHandle<FileEntry>(new FileEntry("fileA", 1024, 9216)),// req no
-    SharedHandle<FileEntry>(new FileEntry("fileB", 1024, 10240)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file1", 1536, 0)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file2", 2048, 1536)),// req no
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file3", 1024, 3584)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file4", 1024, 4608)),// req no
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file5", 1024, 5632)),// req no
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file6", 1024, 6656)),// req no
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file7",  256, 7680)),// req no
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file8",  255, 7936)),
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file9", 1025, 8191)),// req no
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/fileA", 1024, 9216)),// req no
+    SharedHandle<FileEntry>(new FileEntry(storeDir+"/fileB", 1024, 10240)),
   };
   fs[1]->setRequested(false); // file2
   fs[3]->setRequested(false); // file4
@@ -56,8 +59,6 @@ void MultiFileAllocationIteratorTest::testMakeDiskWriterEntries()
   fs[8]->setRequested(false); // file9
   fs[9]->setRequested(false); // fileA
 
-  std::string storeDir = "/tmp/aria2_MultiFileAllocationIteratorTest"
-    "_testMakeDiskWriterEntries";
 
   // create empty file4
   createFile(storeDir+std::string("/file4"), 0);
@@ -79,57 +80,57 @@ void MultiFileAllocationIteratorTest::testMakeDiskWriterEntries()
 
   // file1
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file1"),
-		       entries[0]->getFilePath(storeDir));
+		       entries[0]->getFilePath());
   CPPUNIT_ASSERT(entries[0]->needsFileAllocation());
   CPPUNIT_ASSERT(!entries[0]->getDiskWriter().isNull());
   // file2
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file2"),
-		       entries[1]->getFilePath(storeDir));
+		       entries[1]->getFilePath());
   CPPUNIT_ASSERT(entries[1]->needsFileAllocation());
   CPPUNIT_ASSERT(!entries[1]->getDiskWriter().isNull());
   // file3
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file3"),
-		       entries[2]->getFilePath(storeDir));
+		       entries[2]->getFilePath());
   CPPUNIT_ASSERT(entries[2]->needsFileAllocation());
   CPPUNIT_ASSERT(!entries[2]->getDiskWriter().isNull());
   // file4, diskWriter is not null, because file exists.
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file4"),
-		       entries[3]->getFilePath(storeDir));
+		       entries[3]->getFilePath());
   CPPUNIT_ASSERT(!entries[3]->needsFileAllocation());
   CPPUNIT_ASSERT(!entries[3]->getDiskWriter().isNull());
   // file5
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file5"),
-		       entries[4]->getFilePath(storeDir));
+		       entries[4]->getFilePath());
   CPPUNIT_ASSERT(!entries[4]->needsFileAllocation());
   CPPUNIT_ASSERT(entries[4]->getDiskWriter().isNull());
   // file6
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file6"),
-		       entries[5]->getFilePath(storeDir));
+		       entries[5]->getFilePath());
   CPPUNIT_ASSERT(entries[5]->needsFileAllocation());
   CPPUNIT_ASSERT(!entries[5]->getDiskWriter().isNull());
   // file7
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file7"),
-		       entries[6]->getFilePath(storeDir));
+		       entries[6]->getFilePath());
   CPPUNIT_ASSERT(entries[6]->needsFileAllocation());
   CPPUNIT_ASSERT(!entries[6]->getDiskWriter().isNull());
   // file8
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file8"),
-		       entries[7]->getFilePath(storeDir));
+		       entries[7]->getFilePath());
   CPPUNIT_ASSERT(entries[7]->needsFileAllocation());
   CPPUNIT_ASSERT(!entries[7]->getDiskWriter().isNull());
   // file9
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file9"),
-		       entries[8]->getFilePath(storeDir));
+		       entries[8]->getFilePath());
   CPPUNIT_ASSERT(!entries[8]->needsFileAllocation());
   CPPUNIT_ASSERT(!entries[8]->getDiskWriter().isNull());
   // fileA
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/fileA"),
-		       entries[9]->getFilePath(storeDir));
+		       entries[9]->getFilePath());
   CPPUNIT_ASSERT(!entries[9]->needsFileAllocation());
   CPPUNIT_ASSERT(entries[9]->getDiskWriter().isNull());
   // fileB
   CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/fileB"),
-		       entries[10]->getFilePath(storeDir));
+		       entries[10]->getFilePath());
   CPPUNIT_ASSERT(entries[10]->needsFileAllocation());
   CPPUNIT_ASSERT(!entries[10]->getDiskWriter().isNull());
 }
@@ -158,32 +159,32 @@ void MultiFileAllocationIteratorTest::testAllocate()
     diskAdaptor->setPieceLength(1);
 
     int64_t offset = 0;
-    SharedHandle<FileEntry> fileEntry1(new FileEntry(fname1,
+    SharedHandle<FileEntry> fileEntry1(new FileEntry(storeDir+"/"+fname1,
 						     length1,
 						     offset));
     offset += length1;
-    SharedHandle<FileEntry> fileEntry2(new FileEntry(fname2,
+    SharedHandle<FileEntry> fileEntry2(new FileEntry(storeDir+"/"+fname2,
 						     length2,
 						     offset));
 
     offset += length2;
-    SharedHandle<FileEntry> fileEntry3(new FileEntry(fname3,
+    SharedHandle<FileEntry> fileEntry3(new FileEntry(storeDir+"/"+fname3,
 						     length3,
 						     offset));
 
     offset += length3;
-    SharedHandle<FileEntry> fileEntry4(new FileEntry(fname4,
+    SharedHandle<FileEntry> fileEntry4(new FileEntry(storeDir+"/"+fname4,
 						     length4,
 						     offset));
     fileEntry4->setRequested(false);
 
     offset += length4;
-    SharedHandle<FileEntry> fileEntry5(new FileEntry(fname5,
+    SharedHandle<FileEntry> fileEntry5(new FileEntry(storeDir+"/"+fname5,
 						     length5,
 						     offset));
 
     offset += length5;
-    SharedHandle<FileEntry> fileEntry6(new FileEntry(fname6,
+    SharedHandle<FileEntry> fileEntry6(new FileEntry(storeDir+"/"+fname6,
 						     length6,
 						     offset));
     fileEntry6->setRequested(false);
@@ -197,13 +198,10 @@ void MultiFileAllocationIteratorTest::testAllocate()
     fs.push_back(fileEntry6);
     diskAdaptor->setFileEntries(fs);
 
-    
-    File(storeDir+"/"+fname1).remove();
-    File(storeDir+"/"+fname2).remove();
-    File(storeDir+"/"+fname3).remove();
-    File(storeDir+"/"+fname4).remove();
-    File(storeDir+"/"+fname5).remove();
-    File(storeDir+"/"+fname6).remove();
+    for(std::deque<SharedHandle<FileEntry> >::const_iterator i = fs.begin();
+	i != fs.end(); ++i) {
+      File((*i)->getPath()).remove();
+    }
 
     // we have to open file first.
     diskAdaptor->initAndOpenFile();
@@ -213,14 +211,12 @@ void MultiFileAllocationIteratorTest::testAllocate()
     while(!itr->finished()) {
       itr->allocateChunk();
     }
-    CPPUNIT_ASSERT_EQUAL((uint64_t)length1, File(storeDir+"/"+fname1).size());
-    CPPUNIT_ASSERT_EQUAL((uint64_t)length2, File(storeDir+"/"+fname2).size());
-    CPPUNIT_ASSERT_EQUAL((uint64_t)length3, File(storeDir+"/"+fname3).size());
-    CPPUNIT_ASSERT(!File(storeDir+"/"+fname4).isFile());
-
-    CPPUNIT_ASSERT_EQUAL((uint64_t)length5, File(storeDir+"/"+fname5).size());
-    CPPUNIT_ASSERT(!File(storeDir+"/"+fname6).isFile());
-
+    CPPUNIT_ASSERT_EQUAL((uint64_t)length1, File(fileEntry1->getPath()).size());
+    CPPUNIT_ASSERT_EQUAL((uint64_t)length2, File(fileEntry2->getPath()).size());
+    CPPUNIT_ASSERT_EQUAL((uint64_t)length3, File(fileEntry3->getPath()).size());
+    CPPUNIT_ASSERT(!File(fileEntry4->getPath()).isFile());
+    CPPUNIT_ASSERT_EQUAL((uint64_t)length5, File(fileEntry5->getPath()).size());
+    CPPUNIT_ASSERT(!File(fileEntry6->getPath()).isFile());
   } catch(Exception& e) {
     CPPUNIT_FAIL(e.stackTrace());
   }
diff --git a/test/RequestGroupTest.cc b/test/RequestGroupTest.cc
index 9a385c31..b8558dad 100644
--- a/test/RequestGroupTest.cc
+++ b/test/RequestGroupTest.cc
@@ -83,8 +83,7 @@ void RequestGroupTest::testRemoveURIWhoseHostnameIs()
 void RequestGroupTest::testGetFilePath()
 {
   SharedHandle<SingleFileDownloadContext> ctx
-    (new SingleFileDownloadContext(1024, 1024, "myfile"));
-  ctx->setDir("/tmp");
+    (new SingleFileDownloadContext(1024, 1024, "/tmp/myfile"));
   Option op;
   std::deque<std::string> uris;
 
@@ -101,8 +100,8 @@ void RequestGroupTest::testGetFilePath()
 void RequestGroupTest::testCreateDownloadResult()
 {
   SharedHandle<SingleFileDownloadContext> ctx
-    (new SingleFileDownloadContext(1024, 1024*1024, "myfile"));
-  ctx->setDir("/tmp");
+    (new SingleFileDownloadContext(1024, 1024*1024, "/tmp/myfile"));
+  //ctx->setDir("/tmp");
   Option op;
   std::deque<std::string> uris;
   uris.push_back("http://first/file");
diff --git a/test/SingleFileDownloadContextTest.cc b/test/SingleFileDownloadContextTest.cc
index cf696abb..a69836af 100644
--- a/test/SingleFileDownloadContextTest.cc
+++ b/test/SingleFileDownloadContextTest.cc
@@ -45,13 +45,14 @@ void SingleFileDownloadContextTest::testGetNumPieces()
 void SingleFileDownloadContextTest::testGetActualBasePath()
 {
   SingleFileDownloadContext ctx(0, 0, "");
-  CPPUNIT_ASSERT_EQUAL(std::string("./index.html"), ctx.getActualBasePath());
+  CPPUNIT_ASSERT_EQUAL(std::string(""), ctx.getActualBasePath());
   ctx.setFilename("aria2.tar.bz2");
-  CPPUNIT_ASSERT_EQUAL(std::string("./aria2.tar.bz2"), ctx.getActualBasePath());
-  ctx.setUFilename("aria.tar.bz2");
-  CPPUNIT_ASSERT_EQUAL(std::string("./aria.tar.bz2"), ctx.getActualBasePath());
+  CPPUNIT_ASSERT_EQUAL(std::string("aria2.tar.bz2"), ctx.getActualBasePath());
+  ctx.setUFilename("/t/aria.tar.bz2");
+  CPPUNIT_ASSERT_EQUAL(std::string("/t/aria.tar.bz2"), ctx.getActualBasePath());
   ctx.setDir("/tmp");
-  CPPUNIT_ASSERT_EQUAL(std::string("/tmp/aria.tar.bz2"), ctx.getActualBasePath());
+  // See dir doesn't effect getActualBasePath().
+  CPPUNIT_ASSERT_EQUAL(std::string("/t/aria.tar.bz2"), ctx.getActualBasePath());
 }
 
 } // namespace aria2