X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FNode.test.cc;h=ef2041fb0223bd53f28c2ef5da955429ec5596f8;hb=18d987b03ac188adf6e1a82ebce2666738f0ff65;hp=46bf919376411f1a8a69a452604854ba9129f9a9;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/Console/Node.test.cc b/senf/Utils/Console/Node.test.cc
index 46bf919..ef2041f 100644
--- a/senf/Utils/Console/Node.test.cc
+++ b/senf/Utils/Console/Node.test.cc
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <sstream>
-#include "Node.hh"
+#include "Console.hh"
 #include <boost/iterator/transform_iterator.hpp>
 
 #include <senf/Utils/auto_unit_test.hh>
@@ -37,10 +37,14 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-BOOST_AUTO_UNIT_TEST(genericNode)
+SENF_AUTO_UNIT_TEST(genericNode)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::GenericNode & node (
-        senf::console::root().mkdir("dir1").mkdir("dir2").doc("help info"));
+        senf::console::root()
+        .add("dir1", fty::Directory())
+        .add("dir2", fty::Directory().doc("help info")));
     senf::console::GenericNode::weak_ptr wp (node.thisptr());
 
     BOOST_CHECK_EQUAL( node.name(), "dir2" );
@@ -72,8 +76,10 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(directoryNode)
+SENF_AUTO_UNIT_TEST(directoryNode)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::DirectoryNode::ptr p (senf::console::DirectoryNode::create());
 
     BOOST_CHECK( & senf::console::root().add("dir1", p) == p.get() );
@@ -88,7 +94,9 @@ BOOST_AUTO_UNIT_TEST(directoryNode)
     BOOST_CHECK_THROW( senf::console::root()["fn"], std::bad_cast );
     BOOST_CHECK( &senf::console::root().get("dir1") == p.get() );
     
-    senf::console::root().mkdir("dir2").mkdir("dir3");
+    senf::console::root()
+        .add("dir2", fty::Directory())
+        .add("dir3", fty::Directory());
     char const * const children[] = { "dir1", "dir2", "fn", "sys" };
     BOOST_CHECK_EQUAL_COLLECTIONS( 
         boost::make_transform_iterator(senf::console::root().children().begin(), 
@@ -118,9 +126,9 @@ BOOST_AUTO_UNIT_TEST(directoryNode)
     BOOST_CHECK_EQUAL( p->shorthelp(), "short doc" );
 
     ss.str("");
-    senf::console::root()["dir2"].mkdir("dir4");
-    senf::console::root()["dir2"].link("link", *p);
-    senf::console::root()["dir2"]["dir4"].link("link", senf::console::root());
+    senf::console::root()["dir2"].add("dir4", fty::Directory());
+    senf::console::root()["dir2"].add("link", fty::Link(*p));
+    senf::console::root()["dir2"]["dir4"].add("link", fty::Link(senf::console::root()));
     senf::console::dump(ss, senf::console::root()["dir2"]);
     BOOST_CHECK_EQUAL( ss.str(),
                        "dir3/\n"
@@ -136,10 +144,12 @@ BOOST_AUTO_UNIT_TEST(directoryNode)
                                      senf::console::root().children().end()), 1 );
 }
 
-BOOST_AUTO_UNIT_TEST(linkNode)
+SENF_AUTO_UNIT_TEST(linkNode)
 {
-    senf::console::root().mkdir("dir1");
-    senf::console::root().link("link1", senf::console::root()["dir1"]);
+    namespace fty = senf::console::factory;
+
+    senf::console::root().add("dir1", fty::Directory());
+    senf::console::root().add("link1", fty::Link(senf::console::root()["dir1"]));
 
     BOOST_CHECK( senf::console::root()["dir1"] == senf::console::root()["link1"] );
 
@@ -155,10 +165,12 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(senfConsoleAddNode)
+SENF_AUTO_UNIT_TEST(factory)
 {
-    senf::console::root().add("fn1", &callback);
-    senf::console::root().add("fn2", Functor());
+    namespace fty = senf::console::factory;
+
+    senf::console::root().add("fn1", fty::SimpleCommand(&callback));
+    senf::console::root().add("fn2", fty::SimpleCommand(Functor()));
     
     senf::console::ParseCommandInfo info;
 
@@ -178,7 +190,7 @@ BOOST_AUTO_UNIT_TEST(senfConsoleAddNode)
     senf::console::root().remove("fn2");
 }
 
-BOOST_AUTO_UNIT_TEST(simpleCommandNode)
+SENF_AUTO_UNIT_TEST(simpleCommandNode)
 {
     senf::console::root().add("fn", senf::console::SimpleCommandNode::create(&callback))
         .doc("help text");