2010-06-22 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Made test code not use /tmp
	* test/CookieStorageTest.cc
	* test/DirectDiskAdaptorTest.cc
	* test/FallocFileAllocationIteratorTest.cc
	* test/FileEntryTest.cc
	* test/FileTest.cc
	* test/GZipDecoderTest.cc
	* test/MultiDiskAdaptorTest.cc
	* test/MultiFileAllocationIteratorTest.cc
	* test/RequestGroupManTest.cc
	* test/SignatureTest.cc
	* test/SingleFileAllocationIteratorTest.cc
	* test/UtilTest.cc

ChangeLog

@@ -1,3 +1,19 @@
+2010-06-22  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Made test code not use /tmp
+	* test/CookieStorageTest.cc
+	* test/DirectDiskAdaptorTest.cc
+	* test/FallocFileAllocationIteratorTest.cc
+	* test/FileEntryTest.cc
+	* test/FileTest.cc
+	* test/GZipDecoderTest.cc
+	* test/MultiDiskAdaptorTest.cc
+	* test/MultiFileAllocationIteratorTest.cc
+	* test/RequestGroupManTest.cc
+	* test/SignatureTest.cc
+	* test/SingleFileAllocationIteratorTest.cc
+	* test/UtilTest.cc
+
 2010-06-22  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed that bug that when aria2 is stopped before whole hash

test/CookieStorageTest.cc

@@ -319,13 +319,13 @@ void CookieStorageTest::testLoad_sqlite3()
 void CookieStorageTest::testLoad_fileNotfound()
 {
   CookieStorage st;
-  CPPUNIT_ASSERT(!st.load("/tmp/aria2_CookieStorageTest_testLoad_fileNotfound"));
+  CPPUNIT_ASSERT(!st.load("./aria2_CookieStorageTest_testLoad_fileNotfound"));
 }
 
 void CookieStorageTest::testSaveNsFormat()
 {
   // TODO add cookie with default domain
-  std::string filename = "/tmp/aria2_CookieStorageTest_testSaveNsFormat";
+  std::string filename = "./aria2_CookieStorageTest_testSaveNsFormat";
   File(filename).remove();
   CookieStorage st;
   st.store(Cookie("favorite","classic","/config",".domain.org",true));
@@ -346,7 +346,7 @@ void CookieStorageTest::testSaveNsFormat()
 
 void CookieStorageTest::testSaveNsFormat_fail()
 {
-  std::string filename = "/tmp/aria2_CookieStorageTest_testSaveNsFormat_fail";
+  std::string filename = "./aria2_CookieStorageTest_testSaveNsFormat_fail";
   File f(filename);
   f.remove();
   f.mkdirs();

test/DirectDiskAdaptorTest.cc

@@ -28,7 +28,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(DirectDiskAdaptorTest);
 
 void DirectDiskAdaptorTest::testCutTrailingGarbage()
 {
-  std::string dir = "/tmp";
+  std::string dir = "./";
   SharedHandle<FileEntry> entry
     (new FileEntry(dir+"/aria2_DirectDiskAdaptorTest_testCutTrailingGarbage",
                    256, 0));

test/FallocFileAllocationIteratorTest.cc

@@ -26,7 +26,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( FallocFileAllocationIteratorTest );
 
 void FallocFileAllocationIteratorTest::testAllocate()
 {
-  std::string dir = "/tmp";
+  std::string dir = "./";
   std::string fname = "aria2_FallocFileAllocationIteratorTest_testAllocate";
   std::string fn = dir+"/"+fname;
   std::ofstream of(fn.c_str(), std::ios::binary);

test/FileEntryTest.cc

@@ -50,7 +50,7 @@ static SharedHandle<FileEntry> createFileEntry()
 
 void FileEntryTest::testSetupDir()
 {
-  std::string dir = "/tmp/aria2-FileEntryTest-testSetupDir";
+  std::string dir = "./aria2-FileEntryTest-testSetupDir";
   std::string filename = "filename";
   std::string path = dir+"/"+filename;
   File d(dir);

test/FileTest.cc

@@ -79,7 +79,7 @@ void FileTest::testIsDir() {
 
 void FileTest::testRemove() {
   int fd;
-  std::string name = "/tmp/aria2test";
+  std::string name = "./aria2_FileTest_testRemove_testregfile";
   unlink(name.c_str());
   if((fd = creat(name.c_str(), S_IRUSR|S_IWUSR)) < 0) {
     CPPUNIT_FAIL("cannot create test file");
@@ -92,7 +92,7 @@ void FileTest::testRemove() {
   // delete the file again
   CPPUNIT_ASSERT(!f.remove());
 
-  std::string dir = "/tmp/aria2testdir";
+  std::string dir = "./aria2_FileTest_testRemove_testdir";
 #ifdef __MINGW32__
   mkdir(dir.c_str());
 #else
@@ -112,7 +112,7 @@ void FileTest::testSize() {
 }
 
 void FileTest::testMkdir() {
-  std::string dir = "/tmp/aria2test2/test";
+  std::string dir = "./aria2_FileTest_testMkdir/test";
   File d(dir);
   if(d.exists()) {
     CPPUNIT_ASSERT(d.remove());
@@ -193,12 +193,12 @@ void FileTest::testGetBasename()
 
 void FileTest::testRenameTo()
 {
-  std::string fname = "FileTest_testRenameTo.txt";
+  std::string fname = "aria2_FileTest_testRenameTo.txt";
   std::ofstream of(fname.c_str(), std::ios::binary);
   of.close();
 
   File f(fname);
-  std::string fnameTo = "FileTest_testRenameTo_dest.txt";
+  std::string fnameTo = "aria2_FileTest_testRenameTo_dest.txt";
   CPPUNIT_ASSERT(f.renameTo(fnameTo));
   CPPUNIT_ASSERT(f.exists());
   CPPUNIT_ASSERT(!File(fname).exists());
@@ -213,7 +213,7 @@ void FileTest::testRenameTo()
 
 void FileTest::testUtime()
 {
-  File f("/tmp/FileTest_testUTime");
+  File f("./aria2_FileTest_testUTime");
   createFile(f.getPath(), 0);
   
   time_t atime = (time_t) 100000;
@@ -226,7 +226,7 @@ void FileTest::testUtime()
   CPPUNIT_ASSERT_EQUAL((time_t)atime, buf.st_atime);
   CPPUNIT_ASSERT_EQUAL((time_t)mtime, f.getModifiedTime().getTime());
 
-  File notFound("/tmp/FileTest_testUTime_notFound");
+  File notFound("./aria2_FileTest_testUTime_notFound");
   notFound.remove();
   CPPUNIT_ASSERT(!notFound.utime(Time(atime), Time(mtime)));
 }

test/GZipDecoderTest.cc

@@ -31,7 +31,7 @@ void GZipDecoderTest::testDecode()
   GZipDecoder decoder;
   decoder.init();
 
-  std::string outfile("/tmp/aria2_GZipDecoderTest_testDecode");
+  std::string outfile("./aria2_GZipDecoderTest_testDecode");
 
   char buf[4096];
   std::ifstream in("gzip_decode_test.gz", std::ios::binary);

test/MultiDiskAdaptorTest.cc

@@ -365,7 +365,7 @@ void MultiDiskAdaptorTest::testReadData() {
 
 void MultiDiskAdaptorTest::testCutTrailingGarbage()
 {
-  std::string dir = "/tmp";
+  std::string dir = "./";
   std::string prefix = "aria2_MultiDiskAdaptorTest_testCutTrailingGarbage_";
   SharedHandle<FileEntry> entries[] = {
     SharedHandle<FileEntry>(new FileEntry(dir+"/"+prefix+"1", 256, 0)),
@@ -394,7 +394,7 @@ void MultiDiskAdaptorTest::testCutTrailingGarbage()
 
 void MultiDiskAdaptorTest::testSize()
 {
-  std::string dir = "/tmp";
+  std::string dir = "./";
   std::string prefix = "aria2_MultiDiskAdaptorTest_testSize_";
   SharedHandle<FileEntry> entries[] = {
     SharedHandle<FileEntry>(new FileEntry(dir+"/"+prefix+"1", 1, 0)),
@@ -418,7 +418,7 @@ void MultiDiskAdaptorTest::testSize()
 
 void MultiDiskAdaptorTest::testUtime()
 {
-  std::string storeDir = "/tmp/aria2_MultiDiskAdaptorTest_testUtime";
+  std::string storeDir = "./aria2_MultiDiskAdaptorTest_testUtime";
   SharedHandle<FileEntry> entries[] = {
     SharedHandle<FileEntry>(new FileEntry(storeDir+"/requested", 0, 0)),
     SharedHandle<FileEntry>(new FileEntry(storeDir+"/notFound", 0, 0)),

test/MultiFileAllocationIteratorTest.cc

@@ -35,7 +35,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( MultiFileAllocationIteratorTest );
 
 void MultiFileAllocationIteratorTest::testMakeDiskWriterEntries()
 {
-  std::string storeDir = "/tmp/aria2_MultiFileAllocationIteratorTest"
+  std::string storeDir = "./aria2_MultiFileAllocationIteratorTest"
     "testMakeDiskWriterEntries_";
 
   SharedHandle<FileEntry> fs[] = {
@@ -137,7 +137,7 @@ void MultiFileAllocationIteratorTest::testMakeDiskWriterEntries()
 void MultiFileAllocationIteratorTest::testAllocate()
 {
   std::string storeDir =
-    "/tmp/aria2_MultiFileAllocationIteratorTest_testAllocate";
+    "./aria2_MultiFileAllocationIteratorTest_testAllocate";
 
   std::string fname1 = "file1";
   std::string fname2 = "file2";

test/RequestGroupManTest.cc

@@ -84,7 +84,7 @@ void RequestGroupManTest::testSaveServerStat()
     (std::vector<SharedHandle<RequestGroup> >(),0,option_.get());
   SharedHandle<ServerStat> ss_localhost(new ServerStat("localhost", "http"));
   rm.addServerStat(ss_localhost);
-  File f("/tmp/aria2_RequestGroupManTest_testSaveServerStat");
+  File f("./aria2_RequestGroupManTest_testSaveServerStat");
   if(f.exists()) {
     f.remove();
   }
@@ -98,7 +98,7 @@ void RequestGroupManTest::testSaveServerStat()
 
 void RequestGroupManTest::testLoadServerStat()
 {
-  File f("/tmp/aria2_RequestGroupManTest_testLoadServerStat");
+  File f("./aria2_RequestGroupManTest_testLoadServerStat");
   std::ofstream o(f.getPath().c_str(), std::ios::binary);
   o << "host=localhost, protocol=http, dl_speed=0, last_updated=1219505257,"
     << "status=OK";

test/SignatureTest.cc

@@ -29,7 +29,7 @@ void SignatureTest::testSave()
 {
   Signature sig;
   sig.setBody("SIGNATURE");
-  std::string filepath = "/tmp/aria2_SignatureTest_testSave";
+  std::string filepath = "./aria2_SignatureTest_testSave";
   File outfile(filepath);
   if(outfile.exists()) {
     outfile.remove();

test/SingleFileAllocationIteratorTest.cc

@@ -24,7 +24,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( SingleFileAllocationIteratorTest );
 
 void SingleFileAllocationIteratorTest::testAllocate()
 {
-  std::string dir = "/tmp";
+  std::string dir = "./";
   std::string fname = "aria2_SingleFileAllocationIteratorTest_testAllocate";
   std::string fn = dir+"/"+fname;
   std::ofstream of(fn.c_str(), std::ios::binary);

test/UtilTest.cc

@@ -561,7 +561,7 @@ void UtilTest::testAlphaToNum()
 
 void UtilTest::testMkdirs()
 {
-  std::string dir = "/tmp/aria2-UtilTest-testMkdirs";
+  std::string dir = "./aria2-UtilTest-testMkdirs";
   File d(dir);
   if(d.exists()) {
     CPPUNIT_ASSERT(d.remove());