X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FNode.test.cc;h=f363049a8f4d17171b491ae67361260a0e8edfa1;hb=6aae6e526573187ece558842e928578e5aa4cc4c;hp=f72da5e289526c186e7960cb6c9f6c29312a62bd;hpb=90f51da2398de98c2c217045f791ca7813730f48;p=senf.git

diff --git a/senf/Utils/Console/Node.test.cc b/senf/Utils/Console/Node.test.cc
index f72da5e..f363049 100644
--- a/senf/Utils/Console/Node.test.cc
+++ b/senf/Utils/Console/Node.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>
@@ -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" );
@@ -50,7 +54,7 @@ BOOST_AUTO_UNIT_TEST(genericNode)
     std::stringstream ss;
     node.help(ss);
     BOOST_CHECK_EQUAL( ss.str(), "help info\n" );
-    
+
     {
         senf::console::GenericNode::ptr p (senf::console::root()["dir1"].unlink());
         BOOST_CHECK( ! node.active() );
@@ -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() );
@@ -87,24 +93,26 @@ BOOST_AUTO_UNIT_TEST(directoryNode)
     BOOST_CHECK_THROW( senf::console::root()("fn2"), senf::console::UnknownNodeNameException );
     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(), 
+    BOOST_CHECK_EQUAL_COLLECTIONS(
+        boost::make_transform_iterator(senf::console::root().children().begin(),
                                        select1st<std::string const &>()),
         boost::make_transform_iterator(senf::console::root().children().end(),
                                        select1st<std::string const &>()),
-        children, 
+        children,
         children+sizeof(children)/sizeof(children[0]) );
 
     char const * const completions[] = { "dir1", "dir2" };
     BOOST_CHECK_EQUAL_COLLECTIONS(
-        boost::make_transform_iterator(senf::console::root().completions("dir").begin(), 
+        boost::make_transform_iterator(senf::console::root().completions("dir").begin(),
                                        select1st<std::string const &>()),
         boost::make_transform_iterator(senf::console::root().completions("dir").end(),
                                        select1st<std::string const &>()),
-        completions, 
+        completions,
         completions+sizeof(completions)/sizeof(completions[0]) );
 
     p->doc("test doc\nline 2");
@@ -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,11 +165,13 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(senfConsoleAddNode)
+SENF_AUTO_UNIT_TEST(factory)
 {
-    senf::console::root().add("fn1", &callback);
-    senf::console::root().add("fn2", boost::function<void(std::ostream&,senf::console::ParseCommandInfo const &)>(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;
 
     {
@@ -173,12 +185,12 @@ BOOST_AUTO_UNIT_TEST(senfConsoleAddNode)
         senf::console::root()("fn2")(ss, info);
         BOOST_CHECK_EQUAL( ss.str(), "functor" );
     }
-    
+
     senf::console::root().remove("fn1");
     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");
@@ -188,7 +200,7 @@ BOOST_AUTO_UNIT_TEST(simpleCommandNode)
         senf::console::root()("fn")(ss, info);
         BOOST_CHECK_EQUAL( ss.str(), "callback" );
     }
-    
+
     {
         std::stringstream ss;
         senf::console::root().get("fn").help(ss);