Utils/Console: changed order of factory::Command parameters

[senf.git] / senf / Utils / Console / Node.test.cc

diff --git a/senf/Utils/Console/Node.test.cc b/senf/Utils/Console/Node.test.cc
index f88b91d..be5964c 100644 (file)
--- a/senf/Utils/Console/Node.test.cc
+++ b/senf/Utils/Console/Node.test.cc
@@ -28,16 +28,16 @@
 
 // Custom includes
 #include <sstream>
-#include "Node.hh"
+#include "Console.hh"
 #include <boost/iterator/transform_iterator.hpp>
 
-#include "../../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-BOOST_AUTO_UNIT_TEST(genericNode)
+SENF_AUTO_UNIT_TEST(genericNode)
 {
     senf::console::GenericNode & node (
         senf::console::root().mkdir("dir1").mkdir("dir2").doc("help info"));
@@ -72,7 +72,7 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(directoryNode)
+SENF_AUTO_UNIT_TEST(directoryNode)
 {
     senf::console::DirectoryNode::ptr p (senf::console::DirectoryNode::create());
 
@@ -136,7 +136,7 @@ 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"]);
@@ -155,10 +155,11 @@ 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 +179,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");