From 769783dab420d5fa0ea8d12b13288edfeb90db2f Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 22 Jun 2010 12:28:37 +0000 Subject: [PATCH] 2010-06-22 Tatsuhiro Tsujikawa 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 | 16 ++++++++++++++++ test/CookieStorageTest.cc | 6 +++--- test/DirectDiskAdaptorTest.cc | 2 +- test/FallocFileAllocationIteratorTest.cc | 2 +- test/FileEntryTest.cc | 2 +- test/FileTest.cc | 14 +++++++------- test/GZipDecoderTest.cc | 2 +- test/MultiDiskAdaptorTest.cc | 6 +++--- test/MultiFileAllocationIteratorTest.cc | 4 ++-- test/RequestGroupManTest.cc | 4 ++-- test/SignatureTest.cc | 2 +- test/SingleFileAllocationIteratorTest.cc | 2 +- test/UtilTest.cc | 2 +- 13 files changed, 40 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b21898e7..a124a8363 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2010-06-22 Tatsuhiro Tsujikawa + + 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 Fixed that bug that when aria2 is stopped before whole hash diff --git a/test/CookieStorageTest.cc b/test/CookieStorageTest.cc index 8976cbe51..4143c6391 100644 --- a/test/CookieStorageTest.cc +++ b/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(); diff --git a/test/DirectDiskAdaptorTest.cc b/test/DirectDiskAdaptorTest.cc index 885ded9c3..64287e557 100644 --- a/test/DirectDiskAdaptorTest.cc +++ b/test/DirectDiskAdaptorTest.cc @@ -28,7 +28,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(DirectDiskAdaptorTest); void DirectDiskAdaptorTest::testCutTrailingGarbage() { - std::string dir = "/tmp"; + std::string dir = "./"; SharedHandle entry (new FileEntry(dir+"/aria2_DirectDiskAdaptorTest_testCutTrailingGarbage", 256, 0)); diff --git a/test/FallocFileAllocationIteratorTest.cc b/test/FallocFileAllocationIteratorTest.cc index 3a6624941..f82f89426 100644 --- a/test/FallocFileAllocationIteratorTest.cc +++ b/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); diff --git a/test/FileEntryTest.cc b/test/FileEntryTest.cc index fb5077eb4..daf0a3ad9 100644 --- a/test/FileEntryTest.cc +++ b/test/FileEntryTest.cc @@ -50,7 +50,7 @@ static SharedHandle 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); diff --git a/test/FileTest.cc b/test/FileTest.cc index 5808a79e9..93e35ab37 100644 --- a/test/FileTest.cc +++ b/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))); } diff --git a/test/GZipDecoderTest.cc b/test/GZipDecoderTest.cc index b2cbfc2a5..d0fc95fbc 100644 --- a/test/GZipDecoderTest.cc +++ b/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); diff --git a/test/MultiDiskAdaptorTest.cc b/test/MultiDiskAdaptorTest.cc index 509a524a3..67c6e571d 100644 --- a/test/MultiDiskAdaptorTest.cc +++ b/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 entries[] = { SharedHandle(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 entries[] = { SharedHandle(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 entries[] = { SharedHandle(new FileEntry(storeDir+"/requested", 0, 0)), SharedHandle(new FileEntry(storeDir+"/notFound", 0, 0)), diff --git a/test/MultiFileAllocationIteratorTest.cc b/test/MultiFileAllocationIteratorTest.cc index fa3623e88..70b3a5184 100644 --- a/test/MultiFileAllocationIteratorTest.cc +++ b/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 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"; diff --git a/test/RequestGroupManTest.cc b/test/RequestGroupManTest.cc index b53da6366..edf7e317f 100644 --- a/test/RequestGroupManTest.cc +++ b/test/RequestGroupManTest.cc @@ -84,7 +84,7 @@ void RequestGroupManTest::testSaveServerStat() (std::vector >(),0,option_.get()); SharedHandle 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"; diff --git a/test/SignatureTest.cc b/test/SignatureTest.cc index 905a9a804..af073fa7c 100644 --- a/test/SignatureTest.cc +++ b/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(); diff --git a/test/SingleFileAllocationIteratorTest.cc b/test/SingleFileAllocationIteratorTest.cc index 3143251c0..a6002b105 100644 --- a/test/SingleFileAllocationIteratorTest.cc +++ b/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); diff --git a/test/UtilTest.cc b/test/UtilTest.cc index ddbc4fec1..6a3700da3 100644 --- a/test/UtilTest.cc +++ b/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());