X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FNode.test.cc;h=f363049a8f4d17171b491ae67361260a0e8edfa1;hb=6aae6e526573187ece558842e928578e5aa4cc4c;hp=ef2041fb0223bd53f28c2ef5da955429ec5596f8;hpb=7d62c38fca85add3e5a04f0518d6f1417fa6ca69;p=senf.git diff --git a/senf/Utils/Console/Node.test.cc b/senf/Utils/Console/Node.test.cc index ef2041f..f363049 100644 --- a/senf/Utils/Console/Node.test.cc +++ b/senf/Utils/Console/Node.test.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -54,7 +54,7 @@ SENF_AUTO_UNIT_TEST(genericNode) 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() ); @@ -93,26 +93,26 @@ SENF_AUTO_UNIT_TEST(directoryNode) 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() .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()), boost::make_transform_iterator(senf::console::root().children().end(), select1st()), - 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()), boost::make_transform_iterator(senf::console::root().completions("dir").end(), select1st()), - completions, + completions, completions+sizeof(completions)/sizeof(completions[0]) ); p->doc("test doc\nline 2"); @@ -171,7 +171,7 @@ SENF_AUTO_UNIT_TEST(factory) senf::console::root().add("fn1", fty::SimpleCommand(&callback)); senf::console::root().add("fn2", fty::SimpleCommand(Functor())); - + senf::console::ParseCommandInfo info; { @@ -185,7 +185,7 @@ SENF_AUTO_UNIT_TEST(factory) senf::console::root()("fn2")(ss, info); BOOST_CHECK_EQUAL( ss.str(), "functor" ); } - + senf::console::root().remove("fn1"); senf::console::root().remove("fn2"); } @@ -200,7 +200,7 @@ SENF_AUTO_UNIT_TEST(simpleCommandNode) senf::console::root()("fn")(ss, info); BOOST_CHECK_EQUAL( ss.str(), "callback" ); } - + { std::stringstream ss; senf::console::root().get("fn").help(ss);