X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FExecutor.test.cc;h=85c419c89c5af3b4f283e14f9402225dd187a66f;hb=3a0e403d889f8a16d78d50bbcd7a0f0157b05313;hp=08264596e582212147fe6a120039c8be5e099ea5;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git

diff --git a/senf/Utils/Console/Executor.test.cc b/senf/Utils/Console/Executor.test.cc
index 0826459..85c419c 100644
--- a/senf/Utils/Console/Executor.test.cc
+++ b/senf/Utils/Console/Executor.test.cc
@@ -49,8 +49,10 @@ namespace {
 
 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;
@@ -182,8 +184,11 @@ SENF_AUTO_UNIT_TEST(executor)
 
 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;
@@ -216,8 +221,11 @@ namespace {
 
 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;
@@ -247,8 +255,11 @@ SENF_AUTO_UNIT_TEST(executorPolicy)
 
 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