From 31b44de8b05298127f8368c9baa01534f89b8273 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 13 Apr 2013 14:08:39 -0400 Subject: [PATCH] Bug #1247 - #1247 Tests now create a local dir, rather than use the insecure /tmp dir (thanks to Jakub Wilk). --- ChangeLog | 2 ++ test/directory.t.cpp | 60 ++++++++++++++++++++++++-------------------- test/file.t.cpp | 39 ++++++++++++++++------------ 3 files changed, 58 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8316e0c0..d395c4c52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ Bugs 'Y-M-D' (thanks to Robin Björklin). + #1222 The 'summary' report now obeys the 'color.label' setting (thanks to Steve Rader). + + #1247 Tests now create a local dir, rather than use the insecure /tmp dir + (thanks to Jakub Wilk). + Fixed bug so that 'limit:page' now considers footnote messages. ------ old releases ------------------------------ diff --git a/test/directory.t.cpp b/test/directory.t.cpp index 0a949bc38..444272268 100644 --- a/test/directory.t.cpp +++ b/test/directory.t.cpp @@ -25,7 +25,6 @@ // //////////////////////////////////////////////////////////////////////////////// - #include #include #include @@ -35,37 +34,41 @@ Context context; int main (int argc, char** argv) { - UnitTest t (35); + UnitTest t (37); + + Directory tmp ("tmp"); + tmp.create (); + t.ok (tmp.exists (), "tmp dir created."); // Directory (const File&); // Directory (const Path&); - Directory d0 (Path ("/tmp")); - Directory d1 (File ("/tmp")); - Directory d2 (File (Path ("/tmp"))); + Directory d0 (Path ("tmp")); + Directory d1 (File ("tmp")); + Directory d2 (File (Path ("tmp"))); t.is (d0._data, d1._data, "Directory(std::string) == Directory (File&)"); t.is (d0._data, d2._data, "Directory(std::string) == Directory (File (Path &))"); t.is (d1._data, d2._data, "Directory(File&)) == Directory (File (Path &))"); // Directory (const Directory&); Directory d3 (d2); - t.is (d3._data, "/tmp", "Directory (Directory&)"); + t.is (d3._data, "tmp", "Directory (Directory&)"); // Directory (const std::string&); - Directory d4 ("/tmp/test_directory"); + Directory d4 ("tmp/test_directory"); // Directory& operator= (const Directory&); Directory d5 = d4; - t.is (d5._data, "/tmp/test_directory", "Directory::operator="); + t.is (d5._data, "tmp/test_directory", "Directory::operator="); // operator (std::string) const; - t.is ((std::string) d3, "/tmp", "Directory::operator (std::string) const"); + t.is ((std::string) d3, "tmp", "Directory::operator (std::string) const"); // virtual bool create (); - t.ok (d5.create (), "Directory::create /tmp/test_directory"); - t.ok (d5.exists (), "Directory::exists /tmp/test_directory"); + t.ok (d5.create (), "Directory::create tmp/test_directory"); + t.ok (d5.exists (), "Directory::exists tmp/test_directory"); Directory d6 (d5._data + "/dir"); - t.ok (d6.create (), "Directory::create /tmp/test_directory/dir"); + t.ok (d6.create (), "Directory::create tmp/test_directory/dir"); File::create (d5._data + "/f0"); File::create (d6._data + "/f1"); @@ -74,35 +77,35 @@ int main (int argc, char** argv) std::vector files = d5.list (); std::sort (files.begin (), files.end ()); t.is ((int)files.size (), 2, "Directory::list 1 file"); - t.is (files[0], "/tmp/test_directory/dir", "file[0] is /tmp/test_directory/dir"); - t.is (files[1], "/tmp/test_directory/f0", "file[1] is /tmp/test_directory/f0"); + t.is (files[0], "tmp/test_directory/dir", "file[0] is tmp/test_directory/dir"); + t.is (files[1], "tmp/test_directory/f0", "file[1] is tmp/test_directory/f0"); // std::vector listRecursive (); files = d5.listRecursive (); std::sort (files.begin (), files.end ()); t.is ((int)files.size (), 2, "Directory::list 1 file"); - t.is (files[0], "/tmp/test_directory/dir/f1", "file is /tmp/test_directory/dir/f1"); - t.is (files[1], "/tmp/test_directory/f0", "file is /tmp/test_directory/f0"); + t.is (files[0], "tmp/test_directory/dir/f1", "file is tmp/test_directory/dir/f1"); + t.is (files[1], "tmp/test_directory/f0", "file is tmp/test_directory/f0"); // virtual bool remove (); - t.ok (File::remove (d5._data + "/f0"), "File::remove /tmp/test_directory/f0"); - t.ok (File::remove (d6._data + "/f1"), "File::remove /tmp/test_directory/dir/f1"); + t.ok (File::remove (d5._data + "/f0"), "File::remove tmp/test_directory/f0"); + t.ok (File::remove (d6._data + "/f1"), "File::remove tmp/test_directory/dir/f1"); - t.ok (d6.remove (), "Directory::remove /tmp/test_directory/dir"); - t.notok (d6.exists (), "Directory::exists /tmp/test_directory/dir - no"); + t.ok (d6.remove (), "Directory::remove tmp/test_directory/dir"); + t.notok (d6.exists (), "Directory::exists tmp/test_directory/dir - no"); - t.ok (d5.remove (), "Directory::remove /tmp/test_directory"); - t.notok (d5.exists (), "Directory::exists /tmp/test_directory - no"); + t.ok (d5.remove (), "Directory::remove tmp/test_directory"); + t.notok (d5.exists (), "Directory::exists tmp/test_directory - no"); // bool remove (const std::string&); - Directory d7 ("/tmp/to_be_removed"); - t.ok (d7.create (), "Directory::create /tmp/to_be_removed"); + Directory d7 ("tmp/to_be_removed"); + t.ok (d7.create (), "Directory::create tmp/to_be_removed"); File::create (d7._data + "/f0"); Directory d8 (d7._data + "/another"); - t.ok (d8.create (), "Directory::create /tmp/to_be_removed/another"); + t.ok (d8.create (), "Directory::create tmp/to_be_removed/another"); File::create (d8._data + "/f1"); - t.ok (d7.remove (), "Directory::remove /tmp/to_be_removed"); - t.notok (d7.exists (), "Directory /tmp/to_be_removed gone"); + t.ok (d7.remove (), "Directory::remove tmp/to_be_removed"); + t.notok (d7.exists (), "Directory tmp/to_be_removed gone"); // static std::string cwd (); std::string cwd = Directory::cwd (); @@ -120,6 +123,9 @@ int main (int argc, char** argv) t.is (d9._data, "/", "parent /one --> /"); t.notok (d9.up (), "parent / --> false"); + tmp.remove (); + t.notok (tmp.exists (), "tmp dir removed."); + return 0; } diff --git a/test/file.t.cpp b/test/file.t.cpp index 44880ef4e..4bddc2df4 100644 --- a/test/file.t.cpp +++ b/test/file.t.cpp @@ -25,46 +25,53 @@ // //////////////////////////////////////////////////////////////////////////////// - #include #include +#include #include Context context; int main (int argc, char** argv) { - UnitTest t (13); + UnitTest t (15); - File::write ("/tmp/file.t.txt", "This is a test\n"); - File f6 ("/tmp/file.t.txt"); - t.ok (f6.size () == 15, "File::size /tmp/file.t.txt good"); - t.ok (f6.mode () & S_IRUSR, "File::mode /tmp/file.t.txt good"); - t.ok (File::remove ("/tmp/file.t.txt"), "File::remove /tmp/file.t.txt good"); + Directory tmp ("tmp"); + tmp.create (); + t.ok (tmp.exists (), "tmp dir created."); + + File::write ("tmp/file.t.txt", "This is a test\n"); + File f6 ("tmp/file.t.txt"); + t.ok (f6.size () == 15, "File::size tmp/file.t.txt good"); + t.ok (f6.mode () & S_IRUSR, "File::mode tmp/file.t.txt good"); + t.ok (File::remove ("tmp/file.t.txt"), "File::remove tmp/file.t.txt good"); // operator (std::string) const; - t.is ((std::string) f6, "/tmp/file.t.txt", "File::operator (std::string) const"); + t.is ((std::string) f6, "tmp/file.t.txt", "File::operator (std::string) const"); - t.ok (File::create ("/tmp/file.t.create"), "File::create /tmp/file.t.create good"); - t.ok (File::remove ("/tmp/file.t.create"), "File::remove /tmp/file.t.create good"); + t.ok (File::create ("tmp/file.t.create"), "File::create tmp/file.t.create good"); + t.ok (File::remove ("tmp/file.t.create"), "File::remove tmp/file.t.create good"); // basename (std::string) const; - t.is (f6.name (), "file.t.txt", "File::basename /tmp/file.t.txt --> file.t.txt"); + t.is (f6.name (), "file.t.txt", "File::basename tmp/file.t.txt --> file.t.txt"); // dirname (std::string) const; - t.is (f6.parent (), "/tmp", "File::dirname /tmp/file.t.txt --> /tmp"); + t.is (f6.parent (), "tmp", "File::dirname tmp/file.t.txt --> /tmp"); // bool rename (const std::string&); - File f7 ("/tmp/file.t.2.txt"); + File f7 ("tmp/file.t.2.txt"); f7.append ("something\n"); f7.close (); - t.ok (f7.rename ("/tmp/file.t.3.txt"), "File::rename did not fail"); - t.is (f7._data, "/tmp/file.t.3.txt", "File::rename stored new name"); + t.ok (f7.rename ("tmp/file.t.3.txt"), "File::rename did not fail"); + t.is (f7._data, "tmp/file.t.3.txt", "File::rename stored new name"); t.ok (f7.exists (), "File::rename new file exists"); - t.ok (f7.remove (), "File::remove /tmp/file.t.3.txt good"); + t.ok (f7.remove (), "File::remove tmp/file.t.3.txt good"); t.notok (f7.exists (), "File::remove new file no longer exists"); + tmp.remove (); + t.notok (tmp.exists (), "tmp dir removed."); + return 0; }