X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FExecutor.test.cc;h=85c419c89c5af3b4f283e14f9402225dd187a66f;hb=c92498e86ff9f107be25e9cf159c38f7122dbfc7;hp=31984909af695de3356eb60619d56cd290595350;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/Executor.test.cc b/senf/Utils/Console/Executor.test.cc
index 3198490..85c419c 100644
--- a/senf/Utils/Console/Executor.test.cc
+++ b/senf/Utils/Console/Executor.test.cc
@@ -29,9 +29,9 @@
 // Custom includes
 #include <sstream>
 #include <vector>
-#include "Executor.hh"
+#include "Console.hh"
 
-#include "../../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -47,10 +47,12 @@ namespace {
     }
 }
 
-BOOST_AUTO_UNIT_TEST(executor)
+SENF_AUTO_UNIT_TEST(executor)
 {
-    senf::console::root().mkdir("dir1").mkdir("dir3");
-    senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+    namespace fty = senf::console::factory;
+
+    senf::console::root().add("dir1",fty::Directory()).add("dir3",fty::Directory());
+    senf::console::root().add("dir2",fty::Directory()).doc("Helptext").add("test",fty::Command(&testCommand));
 
     senf::console::Executor executor;
     senf::console::CommandParser parser;
@@ -180,10 +182,13 @@ BOOST_AUTO_UNIT_TEST(executor)
     senf::console::root().remove("dir2");
 }
 
-BOOST_AUTO_UNIT_TEST(executorChroot)
+SENF_AUTO_UNIT_TEST(executorChroot)
 {
-    senf::console::root().mkdir("dir1").mkdir("dir3");
-    senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+    namespace fty = senf::console::factory;
+
+    senf::console::root().add("dir1",fty::Directory()).add("dir3",fty::Directory());
+    senf::console::root().add("dir2",fty::Directory().doc("Helptext"))
+        .add("test", fty::Command(&testCommand));
 
     senf::console::Executor executor;
     senf::console::CommandParser parser;
@@ -214,10 +219,13 @@ namespace {
     }
 }
 
-BOOST_AUTO_UNIT_TEST(executorPolicy)
+SENF_AUTO_UNIT_TEST(executorPolicy)
 {
-    senf::console::root().mkdir("dir1").mkdir("dir3");
-    senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+    namespace fty = senf::console::factory;
+
+    senf::console::root().add("dir1",fty::Directory()).add("dir3",fty::Directory());
+    senf::console::root().add("dir2",fty::Directory().doc("Helptext"))
+        .add("test",fty::Command(&testCommand));
 
     senf::console::Executor executor;
     senf::console::CommandParser parser;
@@ -245,10 +253,13 @@ BOOST_AUTO_UNIT_TEST(executorPolicy)
     senf::console::root().remove("dir2");
 }
 
-BOOST_AUTO_UNIT_TEST(executorAuto)
+SENF_AUTO_UNIT_TEST(executorAuto)
 {
-    senf::console::root().mkdir("tdir1").mkdir("dir3");
-    senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+    namespace fty = senf::console::factory;
+
+    senf::console::root().add("tdir1",fty::Directory()).add("dir3",fty::Directory());
+    senf::console::root().add("dir2",fty::Directory().doc("Helptext"))
+        .add("test",fty::Command(&testCommand));
 
     senf::console::Executor executor;
     executor