// $Id$
//
-// Copyright (C) 2009
+// Copyright (C) 2009
// Fraunhofer Institute for Open Communication Systems (FOKUS)
// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
}
return std::make_pair(keys,sum);
}
-
+
}
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(
BOOST_CHECK_EQUAL( ss.str(), "9\n" "0\n" "5\n" "13\n" "17\n" );
ss.str("");
- SENF_CHECK_NO_THROW(
+ SENF_CHECK_NO_THROW(
parser.parse("help test/test",
boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
BOOST_CHECK_EQUAL(
- ss.str(),
+ ss.str(),
"Usage:\n"
" test [data:vector<int>]\n"
"\n"
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(
BOOST_CHECK_EQUAL( ss.str(), "9\n" "0\n" "5\n" "13\n" "17\n" );
ss.str("");
- SENF_CHECK_NO_THROW(
+ SENF_CHECK_NO_THROW(
parser.parse("help test/test",
boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
BOOST_CHECK_EQUAL(
- ss.str(),
+ ss.str(),
"Usage:\n"
" test [data:list<int>]\n"
"\n"
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(
BOOST_CHECK_EQUAL( ss.str(), "9\n" "0\n" "5\n" "13\n" "17\n" );
ss.str("");
- SENF_CHECK_NO_THROW(
+ SENF_CHECK_NO_THROW(
parser.parse("help test/test",
boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
BOOST_CHECK_EQUAL(
- ss.str(),
+ ss.str(),
"Usage:\n"
" test [data:set<int>]\n"
"\n"
SENF_AUTO_UNIT_TEST(mapSupport)
{
+ namespace fty = senf::console::factory;
+
senf::console::Executor executor;
senf::console::CommandParser parser;
senf::console::ScopedDirectory<> dir;
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(
parser.parse("test/test; test/test (); "
"test/test (vier=4 fuenf = 5 acht=8 )",
boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
- BOOST_CHECK_EQUAL( ss.str(), "(\"barfoo bar\" 9)\n" "(\"\" 0)\n" "(achtfuenfvier 17)\n" ); //
+ BOOST_CHECK_EQUAL( ss.str(), "(\"barfoo bar\" 9)\n" "(\"\" 0)\n" "(achtfuenfvier 17)\n" ); //
ss.str("");
- SENF_CHECK_NO_THROW(
+ SENF_CHECK_NO_THROW(
parser.parse("help test/test",
boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
BOOST_CHECK_EQUAL(
- ss.str(),
+ ss.str(),
"Usage:\n"
" test [data:map<string,int>]\n"
"\n"