aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-20 19:41:40 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-20 19:41:40 +0000
commitabba25627d06352dbd98f38682fe22a0772eec03 (patch)
tree3130ce3d2339371224e9e8cc16ea5d2d7c056b9d
parent97ba277d35ca16d32ac4a85ce1cd2e3ffee1dbde (diff)
downloadpaludis-abba25627d06352dbd98f38682fe22a0772eec03.tar.gz
paludis-abba25627d06352dbd98f38682fe22a0772eec03.tar.xz
gtest more
-rw-r--r--paludis/util/files.m42
-rw-r--r--paludis/util/fs_stat_TEST.cc407
2 files changed, 183 insertions, 226 deletions
diff --git a/paludis/util/files.m4 b/paludis/util/files.m4
index 498cd00..30341cb 100644
--- a/paludis/util/files.m4
+++ b/paludis/util/files.m4
@@ -40,7 +40,7 @@ add(`fd_holder', `hh')
add(`fs_iterator', `hh', `cc', `fwd', `se', `test', `testscript')
add(`fs_error', `hh', `cc')
add(`fs_path', `hh', `cc', `fwd', `se', `test', `testscript')
-add(`fs_stat', `hh', `cc', `fwd', `test', `testscript')
+add(`fs_stat', `hh', `cc', `fwd', `gtest', `testscript')
add(`graph', `hh', `cc', `fwd', `impl', `gtest')
add(`hashes', `hh', `cc', `gtest')
add(`iterator_funcs', `hh', `test')
diff --git a/paludis/util/fs_stat_TEST.cc b/paludis/util/fs_stat_TEST.cc
index f7d5d89..b137034 100644
--- a/paludis/util/fs_stat_TEST.cc
+++ b/paludis/util/fs_stat_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
* Copyright (c) 2006 Mark Loeser
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -24,276 +24,233 @@
#include <paludis/util/log.hh>
#include <paludis/util/timestamp.hh>
#include <paludis/util/options.hh>
-#include <test/test_framework.hh>
-#include <test/test_runner.hh>
+
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <pwd.h>
#include <ctime>
+#include <gtest/gtest.h>
+
using namespace paludis;
-using namespace test;
-namespace test_cases
+TEST(FSStat, Time)
{
- struct FSPathTime : TestCase
- {
- FSPathTime() : TestCase("ctime and mtime") {}
-
- bool repeatable() const
- {
- return false;
- }
+ FSPath a("fs_stat_TEST_dir");
+ FSPath b("fs_stat_TEST_dir/no_perms");
+ FSPath c("fs_stat_TEST_dir/no_such_file");
+ FSPath d("fs_stat_TEST_dir/dir_a/dir_in_a");
- void run()
- {
- FSPath a("fs_stat_TEST_dir");
- FSPath b("fs_stat_TEST_dir/no_perms");
- FSPath c("fs_stat_TEST_dir/no_such_file");
- FSPath d("fs_stat_TEST_dir/dir_a/dir_in_a");
-
- FSStat a_stat(a);
- FSStat b_stat(b);
- FSStat c_stat(c);
- FSStat d_stat(d);
+ FSStat a_stat(a);
+ FSStat b_stat(b);
+ FSStat c_stat(c);
+ FSStat d_stat(d);
#if !defined(__FreeBSD__)
- TEST_CHECK(a_stat.ctim() < Timestamp::now());
- TEST_CHECK(a_stat.mtim() < Timestamp::now());
+ EXPECT_TRUE(a_stat.ctim() < Timestamp::now());
+ EXPECT_TRUE(a_stat.mtim() < Timestamp::now());
#endif
- TEST_CHECK(b_stat.ctim() < Timestamp::now());
- TEST_CHECK(b_stat.mtim() < Timestamp::now());
- TEST_CHECK(d_stat.ctim() < Timestamp::now());
- TEST_CHECK(d_stat.mtim() < Timestamp::now());
-
- TEST_CHECK_THROWS(Timestamp PALUDIS_ATTRIBUTE((unused)) x = c_stat.ctim(), FSError);
- TEST_CHECK_THROWS(Timestamp PALUDIS_ATTRIBUTE((unused)) x = c_stat.mtim(), FSError);
+ EXPECT_TRUE(b_stat.ctim() < Timestamp::now());
+ EXPECT_TRUE(b_stat.mtim() < Timestamp::now());
+ EXPECT_TRUE(d_stat.ctim() < Timestamp::now());
+ EXPECT_TRUE(d_stat.mtim() < Timestamp::now());
- TEST_CHECK(b_stat.mtim() < b_stat.ctim());
- TEST_CHECK(d_stat.mtim() == d_stat.ctim());
- }
- } test_fs_stat_time;
-
- struct FSPathManipulationTest : TestCase
- {
- FSPathManipulationTest() : TestCase("construction and manipulation") { }
-
- void run()
- {
- FSPath f("/foo/bar");
- FSPath c(f);
- TEST_CHECK_EQUAL(f, FSPath("/foo/bar"));
- TEST_CHECK_EQUAL(c, FSPath("/foo/bar"));
- f = FSPath("/baz");
- TEST_CHECK_EQUAL(f, FSPath("/baz"));
- TEST_CHECK_EQUAL(c, FSPath("/foo/bar"));
- c /= "moo";
- TEST_CHECK_EQUAL(f, FSPath("/baz"));
- TEST_CHECK_EQUAL(c, FSPath("/foo/bar/moo"));
- f = c / f;
- TEST_CHECK_EQUAL(f, FSPath("/foo/bar/moo/baz"));
- TEST_CHECK_EQUAL(c, FSPath("/foo/bar/moo"));
-
- f = FSPath::cwd();
-
- TEST_CHECK_EQUAL(f, f / FSPath("/"));
- }
- } test_fs_stat_manipulation;
-
- struct FSPathRealpathTest : TestCase
- {
- FSPathRealpathTest() : TestCase("behavior") { }
-
- bool repeatable() const
- {
- return false;
- }
-
- void run()
- {
- FSPath d("fs_stat_TEST_dir");
- TEST_CHECK(d.stat().is_directory());
-
- d /= "all_perms";
- TEST_CHECK(d.stat().is_regular_file());
-
- FSPath e("fs_stat_TEST_dir/nosuchfile");
- TEST_CHECK(! e.stat().is_regular_file());
- d = e;
- TEST_CHECK(! d.stat().is_regular_file());
- TEST_CHECK(! d.stat().exists());
- TEST_CHECK_THROWS(e.readlink(), FSError);
-
- d = FSPath("fs_stat_TEST_dir/all_perms");
- TEST_CHECK(! e.stat().is_regular_file());
- TEST_CHECK(d.stat().is_regular_file());
- TEST_CHECK(d.stat().exists());
-
- d = FSPath("fs_stat_TEST_dir/symlink_to_dir_a");
- TEST_CHECK(d.stat().is_symlink());
- TEST_CHECK(! d.stat().is_directory());
- TEST_CHECK(d.stat().is_directory_or_symlink_to_directory());
- TEST_CHECK(! d.stat().is_regular_file());
- TEST_CHECK(! d.stat().is_regular_file_or_symlink_to_regular_file());
-
- e = FSPath("fs_stat_TEST_dir/doesnotexist_symlink");
- TEST_CHECK(e.stat().is_symlink());
- TEST_CHECK(e.stat().exists());
- TEST_CHECK(! e.stat().is_directory());
- TEST_CHECK(! e.stat().is_directory_or_symlink_to_directory());
- TEST_CHECK(! e.stat().is_regular_file());
- TEST_CHECK(! e.stat().is_regular_file_or_symlink_to_regular_file());
-
- FSPath f("fs_stat_TEST_dir/symlink_to_dir_a/file_in_a");
- TEST_CHECK(f.stat().is_regular_file());
- TEST_CHECK(! f.stat().is_symlink());
- FSPath r(f.realpath());
- TEST_CHECK(r.stat().is_regular_file());
- std::string g("fs_stat_TEST_dir/dir_a/file_in_a");
- TEST_CHECK_EQUAL(stringify(r).substr(stringify(r).length() - g.length()), g);
-
- FSPath h("fs_stat_TEST_dir/symlink_to_file_in_a");
- TEST_CHECK(h.stat().is_symlink());
- TEST_CHECK(! h.stat().is_regular_file());
- TEST_CHECK(h.stat().is_regular_file_or_symlink_to_regular_file());
- TEST_CHECK_EQUAL(h.readlink(), "dir_a/file_in_a");
-
- FSPath i("fs_stat_TEST_dir/dir_to_make");
- TEST_CHECK(i.mkdir(0755, { fspmkdo_ok_if_exists }));
- TEST_CHECK(! i.mkdir(0755, { fspmkdo_ok_if_exists }));
- TEST_CHECK(i.rmdir());
- FSPath j("fs_stat_TEST_dir/dir_to_make");
- TEST_CHECK(! j.stat().exists());
- TEST_CHECK(! j.stat().is_directory());
-
- FSPath k("fs_stat_TEST_dir/dir_a/file_in_a");
- TEST_CHECK_THROWS(k.mkdir(0755, { fspmkdo_ok_if_exists }), FSError);
-
- FSPath l("fs_stat_TEST_dir/file_a/file_that_triggers_ENOTDIR");
- TEST_CHECK(! l.stat().exists());
- }
- } test_fs_stat_behaviour;
+ EXPECT_THROW(Timestamp PALUDIS_ATTRIBUTE((unused)) x = c_stat.ctim(), FSError);
+ EXPECT_THROW(Timestamp PALUDIS_ATTRIBUTE((unused)) x = c_stat.mtim(), FSError);
- struct FSPathFileSize : TestCase
- {
- FSPathFileSize() : TestCase("file size") {}
+ EXPECT_TRUE(b_stat.mtim() < b_stat.ctim());
+ EXPECT_TRUE(d_stat.mtim() == d_stat.ctim());
+}
- void run()
- {
- FSPath f("fs_stat_TEST_dir/ten_bytes");
- FSPath d("fs_stat_TEST_dir/dir_a");
- FSPath e("fs_stat_TEST_dir/no_such_file");
+TEST(FSStat, Manipulation)
+{
+ FSPath f("/foo/bar");
+ FSPath c(f);
+ EXPECT_EQ(f, FSPath("/foo/bar"));
+ EXPECT_EQ(c, FSPath("/foo/bar"));
+ f = FSPath("/baz");
+ EXPECT_EQ(f, FSPath("/baz"));
+ EXPECT_EQ(c, FSPath("/foo/bar"));
+ c /= "moo";
+ EXPECT_EQ(f, FSPath("/baz"));
+ EXPECT_EQ(c, FSPath("/foo/bar/moo"));
+ f = c / f;
+ EXPECT_EQ(f, FSPath("/foo/bar/moo/baz"));
+ EXPECT_EQ(c, FSPath("/foo/bar/moo"));
+
+ f = FSPath::cwd();
+
+ EXPECT_EQ(f, f / FSPath("/"));
+}
- TEST_CHECK_EQUAL(f.stat().file_size(), 10);
- TEST_CHECK_THROWS(size_t PALUDIS_ATTRIBUTE((unused)) x = d.stat().file_size(), FSError);
- TEST_CHECK_THROWS(size_t PALUDIS_ATTRIBUTE((unused)) x = e.stat().file_size(), FSError);
- }
- } test_fs_stat_size;
+TEST(FSStat, Realpath)
+{
+ FSPath d("fs_stat_TEST_dir");
+ EXPECT_TRUE(d.stat().is_directory());
+
+ d /= "all_perms";
+ EXPECT_TRUE(d.stat().is_regular_file());
+
+ FSPath e("fs_stat_TEST_dir/nosuchfile");
+ EXPECT_TRUE(! e.stat().is_regular_file());
+ d = e;
+ EXPECT_TRUE(! d.stat().is_regular_file());
+ EXPECT_TRUE(! d.stat().exists());
+ EXPECT_THROW(e.readlink(), FSError);
+
+ d = FSPath("fs_stat_TEST_dir/all_perms");
+ EXPECT_TRUE(! e.stat().is_regular_file());
+ EXPECT_TRUE(d.stat().is_regular_file());
+ EXPECT_TRUE(d.stat().exists());
+
+ d = FSPath("fs_stat_TEST_dir/symlink_to_dir_a");
+ EXPECT_TRUE(d.stat().is_symlink());
+ EXPECT_TRUE(! d.stat().is_directory());
+ EXPECT_TRUE(d.stat().is_directory_or_symlink_to_directory());
+ EXPECT_TRUE(! d.stat().is_regular_file());
+ EXPECT_TRUE(! d.stat().is_regular_file_or_symlink_to_regular_file());
+
+ e = FSPath("fs_stat_TEST_dir/doesnotexist_symlink");
+ EXPECT_TRUE(e.stat().is_symlink());
+ EXPECT_TRUE(e.stat().exists());
+ EXPECT_TRUE(! e.stat().is_directory());
+ EXPECT_TRUE(! e.stat().is_directory_or_symlink_to_directory());
+ EXPECT_TRUE(! e.stat().is_regular_file());
+ EXPECT_TRUE(! e.stat().is_regular_file_or_symlink_to_regular_file());
+
+ FSPath f("fs_stat_TEST_dir/symlink_to_dir_a/file_in_a");
+ EXPECT_TRUE(f.stat().is_regular_file());
+ EXPECT_TRUE(! f.stat().is_symlink());
+ FSPath r(f.realpath());
+ EXPECT_TRUE(r.stat().is_regular_file());
+ std::string g("fs_stat_TEST_dir/dir_a/file_in_a");
+ EXPECT_EQ(g, stringify(r).substr(stringify(r).length() - g.length()));
+
+ FSPath h("fs_stat_TEST_dir/symlink_to_file_in_a");
+ EXPECT_TRUE(h.stat().is_symlink());
+ EXPECT_TRUE(! h.stat().is_regular_file());
+ EXPECT_TRUE(h.stat().is_regular_file_or_symlink_to_regular_file());
+ EXPECT_EQ("dir_a/file_in_a", h.readlink());
+
+ FSPath i("fs_stat_TEST_dir/dir_to_make");
+ EXPECT_TRUE(i.mkdir(0755, { fspmkdo_ok_if_exists }));
+ EXPECT_TRUE(! i.mkdir(0755, { fspmkdo_ok_if_exists }));
+ EXPECT_TRUE(i.rmdir());
+ FSPath j("fs_stat_TEST_dir/dir_to_make");
+ EXPECT_TRUE(! j.stat().exists());
+ EXPECT_TRUE(! j.stat().is_directory());
+
+ FSPath k("fs_stat_TEST_dir/dir_a/file_in_a");
+ EXPECT_THROW(k.mkdir(0755, { fspmkdo_ok_if_exists }), FSError);
+
+ FSPath l("fs_stat_TEST_dir/file_a/file_that_triggers_ENOTDIR");
+ EXPECT_TRUE(! l.stat().exists());
+}
- struct FSPathSymlink : TestCase
- {
- FSPathSymlink() : TestCase("symlink") {}
+TEST(FSStat, Size)
+{
+ FSPath f("fs_stat_TEST_dir/ten_bytes");
+ FSPath d("fs_stat_TEST_dir/dir_a");
+ FSPath e("fs_stat_TEST_dir/no_such_file");
- void run()
- {
- FSPath f("fs_stat_TEST_dir/new_sym");
- TEST_CHECK(f.symlink("the_target"));
- TEST_CHECK(f.stat().is_symlink());
- TEST_CHECK_EQUAL(f.readlink(), "the_target");
- f.unlink();
- }
- } test_fs_symlink;
+ EXPECT_EQ(10, f.stat().file_size());
+ EXPECT_THROW(size_t PALUDIS_ATTRIBUTE((unused)) x = d.stat().file_size(), FSError);
+ EXPECT_THROW(size_t PALUDIS_ATTRIBUTE((unused)) x = e.stat().file_size(), FSError);
+}
- struct FSPathChangePerms : TestCase
- {
- FSPathChangePerms() : TestCase("chmod, chown and permissions") {}
+TEST(FSStat, Symlink)
+{
+ FSPath f("fs_stat_TEST_dir/new_sym");
+ EXPECT_TRUE(f.symlink("the_target"));
+ EXPECT_TRUE(f.stat().is_symlink());
+ EXPECT_EQ("the_target", f.readlink());
+ f.unlink();
+}
- void run()
- {
- FSPath a("fs_stat_TEST_dir/no_perms");
+TEST(FSStat, Perms)
+{
+ FSPath a("fs_stat_TEST_dir/no_perms");
- uid_t my_uid = geteuid();
- a.chown(my_uid, -1);
- TEST_CHECK_EQUAL(a.stat().owner(), my_uid);
+ uid_t my_uid = geteuid();
+ a.chown(my_uid, -1);
+ EXPECT_EQ(my_uid, a.stat().owner());
- mode_t all_perms(S_IRUSR | S_IWUSR | S_IXUSR |
- S_IRGRP | S_IWGRP | S_IXGRP |
- S_IROTH | S_IWOTH | S_IXOTH);
- a.chmod(all_perms);
+ mode_t all_perms(S_IRUSR | S_IWUSR | S_IXUSR |
+ S_IRGRP | S_IWGRP | S_IXGRP |
+ S_IROTH | S_IWOTH | S_IXOTH);
+ a.chmod(all_perms);
- FSPath b("fs_stat_TEST_dir/no_perms");
+ FSPath b("fs_stat_TEST_dir/no_perms");
- TEST_CHECK_EQUAL(static_cast<mode_t>(b.stat().permissions() & 0xFFF), all_perms);
+ EXPECT_EQ(all_perms, static_cast<mode_t>(b.stat().permissions() & 0xFFF));
- mode_t no_perms(0);
- b.chmod(no_perms);
+ mode_t no_perms(0);
+ b.chmod(no_perms);
- FSPath c("fs_stat_TEST_dir/no_perms");
- TEST_CHECK_EQUAL(static_cast<mode_t>(c.stat().permissions() & 0xFFF), no_perms);
+ FSPath c("fs_stat_TEST_dir/no_perms");
+ EXPECT_EQ(no_perms, static_cast<mode_t>(c.stat().permissions() & 0xFFF));
- FSPath d("fs_stat_TEST_dir/i_dont_exist");
+ FSPath d("fs_stat_TEST_dir/i_dont_exist");
- TEST_CHECK_THROWS(mode_t PALUDIS_ATTRIBUTE((unused)) x = d.stat().permissions(), FSError);
- TEST_CHECK_THROWS(d.chmod(all_perms), FSError);
- TEST_CHECK_THROWS(d.chown(static_cast<uid_t>(-1), -1), FSError);
- TEST_CHECK_THROWS(uid_t PALUDIS_ATTRIBUTE((unused)) x = d.stat().owner(), FSError);
- TEST_CHECK_THROWS(gid_t PALUDIS_ATTRIBUTE((unused)) x = d.stat().group(), FSError);
+ EXPECT_THROW(mode_t PALUDIS_ATTRIBUTE((unused)) x = d.stat().permissions(), FSError);
+ EXPECT_THROW(d.chmod(all_perms), FSError);
+ EXPECT_THROW(d.chown(static_cast<uid_t>(-1), -1), FSError);
+ EXPECT_THROW(uid_t PALUDIS_ATTRIBUTE((unused)) x = d.stat().owner(), FSError);
+ EXPECT_THROW(gid_t PALUDIS_ATTRIBUTE((unused)) x = d.stat().group(), FSError);
- if (0 == my_uid)
- {
- struct passwd *pw = getpwent();
+ if (0 == my_uid)
+ {
+ struct passwd *pw = getpwent();
- if (! pw)
- throw InternalError(PALUDIS_HERE, "getpwent returned NULL");
+ if (! pw)
+ throw InternalError(PALUDIS_HERE, "getpwent returned NULL");
- std::string my_file("fs_stat_TEST_dir/all_perms");
- FSPath e(my_file);
+ std::string my_file("fs_stat_TEST_dir/all_perms");
+ FSPath e(my_file);
- uid_t my_owner = e.stat().owner();
- gid_t my_group = e.stat().group();
+ uid_t my_owner = e.stat().owner();
+ gid_t my_group = e.stat().group();
- if (pw->pw_uid == my_owner)
- {
- pw = getpwent();
+ if (pw->pw_uid == my_owner)
+ {
+ pw = getpwent();
- if (! pw)
- throw InternalError(PALUDIS_HERE, "getpwent returned NULL");
- }
+ if (! pw)
+ throw InternalError(PALUDIS_HERE, "getpwent returned NULL");
+ }
- uid_t new_owner(pw->pw_uid);
+ uid_t new_owner(pw->pw_uid);
- e.chown(new_owner, -1);
+ e.chown(new_owner, -1);
- TEST_CHECK_EQUAL(FSPath(my_file).stat().owner(), new_owner);
- TEST_CHECK_EQUAL(FSPath(my_file).stat().group(), my_group);
+ EXPECT_EQ(new_owner, FSPath(my_file).stat().owner());
+ EXPECT_EQ(my_group, FSPath(my_file).stat().group());
- gid_t new_group(pw->pw_gid);
+ gid_t new_group(pw->pw_gid);
- endpwent();
+ endpwent();
- e.chown(static_cast<uid_t>(-1), new_group);
+ e.chown(static_cast<uid_t>(-1), new_group);
- TEST_CHECK_EQUAL(FSPath(my_file).stat().owner(), new_owner);
- TEST_CHECK_EQUAL(FSPath(my_file).stat().group(), new_group);
+ EXPECT_EQ(new_owner, FSPath(my_file).stat().owner());
+ EXPECT_EQ(new_group, FSPath(my_file).stat().group());
- e.chown(static_cast<uid_t>(-1), -1);
+ e.chown(static_cast<uid_t>(-1), -1);
- TEST_CHECK_EQUAL(FSPath(my_file).stat().owner(), new_owner);
- TEST_CHECK_EQUAL(FSPath(my_file).stat().group(), new_group);
+ EXPECT_EQ(new_owner, FSPath(my_file).stat().owner());
+ EXPECT_EQ(new_group, FSPath(my_file).stat().group());
- e.chown(my_owner, my_group);
+ e.chown(my_owner, my_group);
- TEST_CHECK_EQUAL(FSPath(my_file).stat().owner(), my_owner);
- TEST_CHECK_EQUAL(FSPath(my_file).stat().group(), my_group);
- }
- else
- {
- FSPath e("fs_stat_TEST_dir/all_perms");
+ EXPECT_EQ(my_owner, FSPath(my_file).stat().owner());
+ EXPECT_EQ(my_group, FSPath(my_file).stat().group());
+ }
+ else
+ {
+ FSPath e("fs_stat_TEST_dir/all_perms");
- TEST_CHECK_THROWS(e.chown(0, 0), FSError);
- }
- }
- } test_fs_stat_change_perms;
+ EXPECT_THROW(e.chown(0, 0), FSError);
+ }
}