X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FConfig.test.cc;h=d20483a8d07e4259d6b4f711937f630957944938;hb=d80f142699130075658d6448c90adf71338f2c5a;hp=d3199664d9b8efad68aa49bea591f95f4547cb42;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git diff --git a/senf/Utils/Console/Config.test.cc b/senf/Utils/Console/Config.test.cc index d319966..d20483a 100644 --- a/senf/Utils/Console/Config.test.cc +++ b/senf/Utils/Console/Config.test.cc @@ -60,20 +60,37 @@ namespace { std::string name_; std::ofstream file_; }; + +} + +SENF_AUTO_UNIT_TEST(configBundle_empty) +{ + TempFile cfg ("test.cfg"); + cfg << TempFile::close; + + senf::console::ScopedDirectory<> root; + root.add("fun2", senf::console::factory::Command(&fun2)); + + senf::console::ConfigBundle bundle(root); + bundle.add( senf::console::FileConfig(cfg.name())); + + SENF_CHECK_NO_THROW( bundle.parse() ); } SENF_AUTO_UNIT_TEST(configBundle) { + namespace fty = senf::console::factory; + senf::console::ScopedDirectory<> root; senf::console::root().add("root", root); senf::console::ScopedDirectory<> chroot; senf::console::root().add("chroot", chroot); - root.mkdir("dir1").add("fun1", &fun1); - root.add("fun2", &fun2); - chroot.mkdir("dir1").add("fun1", &fun1); - chroot.add("fun2", &fun2); + root.add("dir1", fty::Directory()).add("fun1", fty::Command(&fun1)); + root.add("fun2", fty::Command(&fun2)); + chroot.add("dir1", fty::Directory()).add("fun1", fty::Command(&fun1)); + chroot.add("fun2", fty::Command(&fun2)); TempFile cfg ("test.cfg"); cfg << "dir1/fun1 foo; fun2;" << TempFile::close;