X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FTraits.test.cc;fp=senf%2FUtils%2FConsole%2FTraits.test.cc;h=cc5697f4c02a233cf0445ade70aafe6f68dd7a5f;hb=f13780e9e4da7df981d6f6542fbdc714beb34765;hp=59f848a04fc5ac0e2b0ebf2fa89e390e50ac40fb;hpb=6019c18e7b74d3e91293f35df660a80346ef7a1e;p=senf.git

diff --git a/senf/Utils/Console/Traits.test.cc b/senf/Utils/Console/Traits.test.cc
index 59f848a..cc5697f 100644
--- a/senf/Utils/Console/Traits.test.cc
+++ b/senf/Utils/Console/Traits.test.cc
@@ -56,15 +56,17 @@ namespace {
 
 SENF_AUTO_UNIT_TEST(charTraits)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
     senf::console::root().add("test", dir);
     std::stringstream ss;
 
-    dir.add("test",&charTest);
-    dir.add("stest",&scharTest);
-    dir.add("utest",&ucharTest);
+    dir.add("test",fty::Command(&charTest));
+    dir.add("stest",fty::Command(&scharTest));
+    dir.add("utest",fty::Command(&ucharTest));
 
     SENF_CHECK_NO_THROW(
         parser.parse("test/test 10; test/test 20",
@@ -87,12 +89,14 @@ SENF_AUTO_UNIT_TEST(charTraits)
 
 SENF_AUTO_UNIT_TEST(boolTraits)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
     senf::console::root().add("test", dir);
 
-    dir.add("test", &boolTest);
+    dir.add("test", fty::Command(&boolTest));
 
     std::stringstream ss;
     SENF_CHECK_NO_THROW(
@@ -118,7 +122,7 @@ SENF_AUTO_UNIT_TEST(boolTraits)
                      boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
     BOOST_CHECK_EQUAL( ss.str(), "true\n" "true\n" );
 
-    dir.add("test2", &boolTest).formatter( senf::console::formatEnabledDisabled );
+    dir.add("test2", fty::Command(&boolTest).formatter( senf::console::formatEnabledDisabled ));
     ss.str("");
     SENF_CHECK_NO_THROW(
         parser.parse("test/test2 0; test/test2 -1",
@@ -135,12 +139,14 @@ SENF_AUTO_UNIT_TEST(stringTraits)
 
 SENF_AUTO_UNIT_TEST(enumSupport)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
     senf::console::root().add("test", dir);
 
-    dir.add("test",&test);
+    dir.add("test",fty::Command(&test));
     
     std::stringstream ss;
     SENF_CHECK_NO_THROW(
@@ -164,7 +170,7 @@ SENF_AUTO_UNIT_TEST(enumSupport)
                      boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )),
         senf::console::SyntaxErrorException );
 
-    dir.add("member", &TestClass::test);
+    dir.add("member", fty::Command(&TestClass::test));
 
     ss.str("");
     SENF_CHECK_NO_THROW(