// 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>
}
-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(
" 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(
" 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(
" 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;
senf::console::root().add("test", dir);
std::map<std::string, int> defv (
- boost::assign::map_list_of("foo",7)("bar",2).to_container(defv));
- dir.add("test", &mapTest)
- .arg("data", "test data", senf::console::kw::default_value = defv);
+ boost::assign::map_list_of("foo bar",7)("bar",2).to_container(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 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(
"\n"
"With:\n"
" data test data\n"
- " default: (bar=2 foo=7)\n" );
+ " default: (bar=2 \"foo bar\"=7)\n" );
}
///////////////////////////////cc.e////////////////////////////////////////