Utils/Console: added missing ScopedDirectory proxy members

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

diff --git a/senf/Utils/Console/STLSupport.test.cc b/senf/Utils/Console/STLSupport.test.cc
index ddc78dc..9ce13ad 100644 (file)
--- a/senf/Utils/Console/STLSupport.test.cc
+++ b/senf/Utils/Console/STLSupport.test.cc
@@ -28,11 +28,7 @@
 
 // Custom includes
 #include <boost/assign/list_of.hpp>
-#include "STLSupport.hh"
-#include "ParsedCommand.hh"
-#include "Executor.hh"
-#include "Parse.hh"
-#include "ScopedDirectory.hh"
+#include "Console.hh"
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
@@ -69,16 +65,19 @@ namespace {
                 
 }
 
-BOOST_AUTO_UNIT_TEST(vectorSupport)
+SENF_AUTO_UNIT_TEST(vectorSupport)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
     senf::console::root().add("test", dir);
 
     std::vector<int> defv (boost::assign::list_of(7)(2).to_container(defv));
-    dir.add("test", &Summer<std::vector<int> >::test)
-        .arg("data", "test data", senf::console::kw::default_value = defv);
+    dir.add("test", fty::Command(&Summer<std::vector<int> >::test)
+        .arg("data", "test data", senf::console::kw::default_value = defv)
+        );
     std::stringstream ss;
 
     SENF_CHECK_NO_THROW(
@@ -100,16 +99,19 @@ BOOST_AUTO_UNIT_TEST(vectorSupport)
         "        default: (7 2)\n" );
 }
 
-BOOST_AUTO_UNIT_TEST(listSupport)
+SENF_AUTO_UNIT_TEST(listSupport)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
     senf::console::root().add("test", dir);
 
     std::list<int> defv (boost::assign::list_of(7)(2).to_container(defv));
-    dir.add("test", &Summer<std::list<int> >::test)
-        .arg("data", "test data", senf::console::kw::default_value = defv);
+    dir.add("test", fty::Command(&Summer<std::list<int> >::test)
+        .arg("data", "test data", senf::console::kw::default_value = defv)
+        );
     std::stringstream ss;
 
     SENF_CHECK_NO_THROW(
@@ -131,16 +133,19 @@ BOOST_AUTO_UNIT_TEST(listSupport)
         "        default: (7 2)\n" );
 }
 
-BOOST_AUTO_UNIT_TEST(setSupport)
+SENF_AUTO_UNIT_TEST(setSupport)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
     senf::console::root().add("test", dir);
 
     std::set<int> defv (boost::assign::list_of(7)(2).to_container(defv));
-    dir.add("test", &Summer<std::set<int> >::test)
-        .arg("data", "test data", senf::console::kw::default_value = defv);
+    dir.add("test", fty::Command(&Summer<std::set<int> >::test)
+        .arg("data", "test data", senf::console::kw::default_value = defv)
+        );
     std::stringstream ss;
 
     SENF_CHECK_NO_THROW(
@@ -162,8 +167,10 @@ BOOST_AUTO_UNIT_TEST(setSupport)
         "        default: (2 7)\n" );
 }
 
-BOOST_AUTO_UNIT_TEST(mapSupport)
+SENF_AUTO_UNIT_TEST(mapSupport)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
@@ -171,8 +178,9 @@ BOOST_AUTO_UNIT_TEST(mapSupport)
 
     std::map<std::string, int> defv (
         boost::assign::map_list_of("foo bar",7)("bar",2).to_container(defv));
-    dir.add("test", &mapTest)
-        .arg("data", "test data", senf::console::kw::default_value = defv);
+    dir.add("test", fty::Command(&mapTest)
+        .arg("data", "test data", senf::console::kw::default_value = defv)
+        );
     std::stringstream ss;
 
     SENF_CHECK_NO_THROW(