X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FConfig.test.cc;h=d20483a8d07e4259d6b4f711937f630957944938;hb=d80f142699130075658d6448c90adf71338f2c5a;hp=2058a545ab70bdcdaf93f3125418fe296b721a8d;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/Console/Config.test.cc b/senf/Utils/Console/Config.test.cc
index 2058a54..d20483a 100644
--- a/senf/Utils/Console/Config.test.cc
+++ b/senf/Utils/Console/Config.test.cc
@@ -27,11 +27,7 @@
 //#include "Config.test.ih"
 
 // Custom includes
-#include "Config.hh"
-#include "ScopedDirectory.hh"
-#include "ParsedCommand.hh"
-#include "ConfigFile.hh"
-#include "ProgramOptions.hh"
+#include "Console.hh"
 #include <boost/filesystem/operations.hpp>
 
 #include <senf/Utils/auto_unit_test.hh>
@@ -64,20 +60,37 @@ namespace {
         std::string name_;
         std::ofstream file_;
     };
+   
 }
 
-BOOST_AUTO_UNIT_TEST(configBundle)
+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;