Console: SystemException in parseFile() should include filename

[senf.git] / senf / Utils / Console / ConfigFile.test.cc

diff --git a/senf/Utils/Console/ConfigFile.test.cc b/senf/Utils/Console/ConfigFile.test.cc
index adf4f34..692fad6 100644 (file)
--- a/senf/Utils/Console/ConfigFile.test.cc
+++ b/senf/Utils/Console/ConfigFile.test.cc
@@ -62,15 +62,28 @@ namespace {
     
 }
 
-BOOST_AUTO_UNIT_TEST(configFile)
+#define SENF_CHECK_THROW_SYSTEMEXCEPTION( expr, errorNumber, msg)   \
+    try {                                                           \
+        BOOST_TEST_PASSPOINT();                                     \
+        expr;                                                       \
+        BOOST_ERROR( "senf::SystemException is expected");          \
+    } catch( senf::SystemException const & ex ) {                   \
+        BOOST_CHECK( ex.anyOf( errorNumber));                       \
+        BOOST_CHECK( ex.message().find(msg) != std::string::npos);  \
+    }                                                               \
+        
+
+SENF_AUTO_UNIT_TEST(configFile)
 {
+    namespace fty = senf::console::factory;
+
     TempFile cfgf ("test.cfg");
     cfgf << "dir1/fun1 10;\n" 
          << TempFile::close;
     
     senf::console::ScopedDirectory<> dir1;
     senf::console::root().add("dir1", dir1);
-    dir1.add("fun1",&fun1);
+    dir1.add("fun1",fty::Command(&fun1));
 
     {
         senf::console::ConfigFile cfg (cfgf.name());
@@ -91,13 +104,23 @@ BOOST_AUTO_UNIT_TEST(configFile)
 
     {
         senf::console::ConfigFile cfg ("i don't exist");
+        SENF_CHECK_THROW_SYSTEMEXCEPTION(cfg.parse(), ENOENT, "i don't exist");
         cfg.ignoreMissing();
         SENF_CHECK_NO_THROW( cfg.parse() );
     }
+    {
+        std::string etc_shaddow ("/etc/shadow");
+        if (getuid() != 0 && boost::filesystem::exists(etc_shaddow)) {
+            senf::console::ConfigFile cfg (etc_shaddow);
+            SENF_CHECK_THROW_SYSTEMEXCEPTION( cfg.parse(), EACCES, etc_shaddow);
+        }
+    }
 }
 
-BOOST_AUTO_UNIT_TEST(configFileRestrict)
+SENF_AUTO_UNIT_TEST(configFileRestrict)
 {
+    namespace fty = senf::console::factory;
+
     TempFile cfgf ("test.cfg");
     cfgf << "dir1/fun1 10;\n"
          << "dir2/fun2;\n"
@@ -105,7 +128,7 @@ BOOST_AUTO_UNIT_TEST(configFileRestrict)
     
     senf::console::ScopedDirectory<> dir1;
     senf::console::root().add("dir1", dir1);
-    dir1.add("fun1",&fun1);
+    dir1.add("fun1",fty::Command(&fun1));
     
     {
         var1 = 0;
@@ -119,7 +142,7 @@ BOOST_AUTO_UNIT_TEST(configFileRestrict)
 
         senf::console::ScopedDirectory<> dir2;
         senf::console::root().add("dir2", dir2);
-        dir2.add("fun2",&fun2);
+        dir2.add("fun2",fty::Command(&fun2));
 
         var1 = 0;
         var2 = false;
@@ -130,8 +153,10 @@ BOOST_AUTO_UNIT_TEST(configFileRestrict)
     }
 }
 
-BOOST_AUTO_UNIT_TEST(configFileSkipGroup)
+SENF_AUTO_UNIT_TEST(configFileSkipGroup)
 {
+    namespace fty = senf::console::factory;
+
     TempFile cfgf ("test.cfg");
     cfgf << "dir1/fun1 10;\n"
          << "dir2 { dir3 { fun2; } fun1 5; }"
@@ -139,13 +164,13 @@ BOOST_AUTO_UNIT_TEST(configFileSkipGroup)
     
     senf::console::ScopedDirectory<> dir1;
     senf::console::root().add("dir1", dir1);
-    dir1.add("fun1",&fun1);
+    dir1.add("fun1",fty::Command(&fun1));
     
     senf::console::ScopedDirectory<> dir2;
     senf::console::root().add("dir2", dir2);
     
-    dir2.mkdir("dir3").add("fun2", &fun2);
-    dir2.add("fun1", &fun1);
+    dir2.add("dir3",fty::Directory()).add("fun2", fty::Command(&fun2));
+    dir2.add("fun1", fty::Command(&fun1));
 
     {
         var1 = 0;
@@ -171,8 +196,10 @@ BOOST_AUTO_UNIT_TEST(configFileSkipGroup)
     }
 }
 
-BOOST_AUTO_UNIT_TEST(configRestrictAndLink)
+SENF_AUTO_UNIT_TEST(configRestrictAndLink)
 {
+    namespace fty = senf::console::factory;
+
     TempFile cfgf ("test.cfg");
     cfgf << "dir1/fun1 10;\n"
          << "link1 { dir3 { fun2; } fun1 5; }"
@@ -180,17 +207,17 @@ BOOST_AUTO_UNIT_TEST(configRestrictAndLink)
     
     senf::console::ScopedDirectory<> dir1;
     senf::console::root().add("dir1", dir1);
-    dir1.add("fun1",&fun1);
+    dir1.add("fun1",fty::Command(&fun1));
     
     senf::console::ScopedDirectory<> dir2;
     dir1.add("dir2", dir2);
     
-    dir2.mkdir("dir3").add("fun2", &fun2);
-    dir2.add("fun1", &fun1);
+    dir2.add("dir3",fty::Directory()).add("fun2", fty::Command(&fun2));
+    dir2.add("fun1", fty::Command(&fun1));
 
     senf::console::ScopedDirectory<> dir4;
     senf::console::root().add("dir4", dir4);
-    dir4.link("link1", dir2);
+    dir4.add("link1", fty::Link(dir2));
 
     {
         senf::console::ConfigFile cfg (cfgf.name(), dir4);