X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FExecutor.test.cc;h=24bd307802f54bf4f2fb669ddc06ce61c3bd9ecb;hb=6aae6e526573187ece558842e928578e5aa4cc4c;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..24bd307 100644
--- a/senf/Utils/Console/Executor.test.cc
+++ b/senf/Utils/Console/Executor.test.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -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,16 +47,18 @@ 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;
 
     BOOST_CHECK( &executor.cwd() == &senf::console::root() );
-    
+
     {
         std::stringstream os;
         parser.parse("cd dir1", &setCommand);
@@ -99,7 +101,7 @@ BOOST_AUTO_UNIT_TEST(executor)
         parser.parse("ll", &setCommand);
         executor(os, commands.back());
         BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinLL );
-        BOOST_CHECK_EQUAL( os.str(), 
+        BOOST_CHECK_EQUAL( os.str(),
                            "dir1/                       \n"
                            "dir2/                       Helptext\n"
                            "sys/                        \n" );
@@ -120,7 +122,7 @@ BOOST_AUTO_UNIT_TEST(executor)
         BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinLS );
         BOOST_CHECK_EQUAL( os.str(), "" );
     }
-    
+
     {
         std::stringstream os;
         parser.parse("lr", &setCommand);
@@ -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;
@@ -206,7 +211,7 @@ BOOST_AUTO_UNIT_TEST(executorChroot)
 }
 
 namespace {
-    
+
     void testPolicy(senf::console::DirectoryNode & dir, std::string const & entry)
     {
         if (dir == senf::console::root() && entry == "dir2")
@@ -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
@@ -279,14 +290,14 @@ BOOST_AUTO_UNIT_TEST(executorAuto)
         BOOST_CHECK_EQUAL( executor.cwdPath(), "/dir2" );
         BOOST_CHECK_EQUAL( os.str(), "" );
     }
-    
+
     {
         std::stringstream os;
         parser.parse("t", &setCommand);
         executor(os, commands.back());
         BOOST_CHECK_EQUAL( os.str(), "testCommand\n" );
     }
-    
+
     commands.clear();
     senf::console::root().remove("tdir1");
     senf::console::root().remove("dir2");