X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FConfig.test.cc;h=2e830da1a7c78cd4f4b9ef40365e70133cc769e8;hb=18d987b03ac188adf6e1a82ebce2666738f0ff65;hp=daefcca5f09dbcd56070c00f400392ec1aa4c436;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/Config.test.cc b/senf/Utils/Console/Config.test.cc
index daefcca..2e830da 100644
--- a/senf/Utils/Console/Config.test.cc
+++ b/senf/Utils/Console/Config.test.cc
@@ -27,14 +27,10 @@
 //#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 "../../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -64,20 +60,23 @@ namespace {
         std::string name_;
         std::ofstream file_;
     };
+   
 }
 
-BOOST_AUTO_UNIT_TEST(configBundle)
+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;