// $Id$
//
-// Copyright (C) 2008
+// Copyright (C) 2008
// Fraunhofer Institute for Open Communication Systems (FOKUS)
// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-BOOST_AUTO_UNIT_TEST(genericNode)
+SENF_AUTO_UNIT_TEST(genericNode)
{
+ namespace fty = senf::console::factory;
+
senf::console::GenericNode & node (
- senf::console::root().mkdir("dir1").mkdir("dir2").doc("help info"));
+ senf::console::root()
+ .add("dir1", fty::Directory())
+ .add("dir2", fty::Directory().doc("help info")));
senf::console::GenericNode::weak_ptr wp (node.thisptr());
BOOST_CHECK_EQUAL( node.name(), "dir2" );
std::stringstream ss;
node.help(ss);
BOOST_CHECK_EQUAL( ss.str(), "help info\n" );
-
+
{
senf::console::GenericNode::ptr p (senf::console::root()["dir1"].unlink());
BOOST_CHECK( ! node.active() );
};
}
-BOOST_AUTO_UNIT_TEST(directoryNode)
+SENF_AUTO_UNIT_TEST(directoryNode)
{
+ namespace fty = senf::console::factory;
+
senf::console::DirectoryNode::ptr p (senf::console::DirectoryNode::create());
BOOST_CHECK( & senf::console::root().add("dir1", p) == p.get() );
BOOST_CHECK_THROW( senf::console::root()("fn2"), senf::console::UnknownNodeNameException );
BOOST_CHECK_THROW( senf::console::root()["fn"], std::bad_cast );
BOOST_CHECK( &senf::console::root().get("dir1") == p.get() );
-
- senf::console::root().mkdir("dir2").mkdir("dir3");
+
+ senf::console::root()
+ .add("dir2", fty::Directory())
+ .add("dir3", fty::Directory());
char const * const children[] = { "dir1", "dir2", "fn", "sys" };
- BOOST_CHECK_EQUAL_COLLECTIONS(
- boost::make_transform_iterator(senf::console::root().children().begin(),
+ BOOST_CHECK_EQUAL_COLLECTIONS(
+ boost::make_transform_iterator(senf::console::root().children().begin(),
select1st<std::string const &>()),
boost::make_transform_iterator(senf::console::root().children().end(),
select1st<std::string const &>()),
- children,
+ children,
children+sizeof(children)/sizeof(children[0]) );
char const * const completions[] = { "dir1", "dir2" };
BOOST_CHECK_EQUAL_COLLECTIONS(
- boost::make_transform_iterator(senf::console::root().completions("dir").begin(),
+ boost::make_transform_iterator(senf::console::root().completions("dir").begin(),
select1st<std::string const &>()),
boost::make_transform_iterator(senf::console::root().completions("dir").end(),
select1st<std::string const &>()),
- completions,
+ completions,
completions+sizeof(completions)/sizeof(completions[0]) );
p->doc("test doc\nline 2");
BOOST_CHECK_EQUAL( p->shorthelp(), "short doc" );
ss.str("");
- senf::console::root()["dir2"].mkdir("dir4");
- senf::console::root()["dir2"].link("link", *p);
- senf::console::root()["dir2"]["dir4"].link("link", senf::console::root());
+ senf::console::root()["dir2"].add("dir4", fty::Directory());
+ senf::console::root()["dir2"].add("link", fty::Link(*p));
+ senf::console::root()["dir2"]["dir4"].add("link", fty::Link(senf::console::root()));
senf::console::dump(ss, senf::console::root()["dir2"]);
BOOST_CHECK_EQUAL( ss.str(),
"dir3/\n"
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"]);
+ namespace fty = senf::console::factory;
+
+ senf::console::root().add("dir1", fty::Directory());
+ senf::console::root().add("link1", fty::Link(senf::console::root()["dir1"]));
BOOST_CHECK( senf::console::root()["dir1"] == senf::console::root()["link1"] );
};
}
-BOOST_AUTO_UNIT_TEST(senfConsoleAddNode)
+SENF_AUTO_UNIT_TEST(factory)
{
- senf::console::root().add("fn1", &callback);
- senf::console::root().add("fn2", boost::function<void(std::ostream&,senf::console::ParseCommandInfo const &)>(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;
{
senf::console::root()("fn2")(ss, info);
BOOST_CHECK_EQUAL( ss.str(), "functor" );
}
-
+
senf::console::root().remove("fn1");
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");
senf::console::root()("fn")(ss, info);
BOOST_CHECK_EQUAL( ss.str(), "callback" );
}
-
+
{
std::stringstream ss;
senf::console::root().get("fn").help(ss);