X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FNode.test.cc;h=b1a02b3e3ff1e4639cf8094a58e67d0fd934ee3b;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=f88b91d938d782cfa9999929f4c2afa807d84802;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Utils/Console/Node.test.cc b/senf/Utils/Console/Node.test.cc index f88b91d..b1a02b3 100644 --- a/senf/Utils/Console/Node.test.cc +++ b/senf/Utils/Console/Node.test.cc @@ -1,24 +1,29 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief Node unit tests */ @@ -28,19 +33,23 @@ // Custom includes #include -#include "Node.hh" +#include "Console.hh" #include -#include "../../Utils/auto_unit_test.hh" +#include #include #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" ); @@ -50,7 +59,7 @@ BOOST_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() ); @@ -72,8 +81,10 @@ namespace { }; } -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() ); @@ -87,24 +98,26 @@ BOOST_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().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()), 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"); @@ -118,9 +131,9 @@ BOOST_AUTO_UNIT_TEST(directoryNode) 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" @@ -136,10 +149,12 @@ BOOST_AUTO_UNIT_TEST(directoryNode) 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"] ); @@ -155,11 +170,13 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(senfConsoleAddNode) +SENF_AUTO_UNIT_TEST(factory) { - senf::console::root().add("fn1", &callback); - senf::console::root().add("fn2", 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; { @@ -173,12 +190,12 @@ BOOST_AUTO_UNIT_TEST(senfConsoleAddNode) 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"); @@ -188,7 +205,7 @@ BOOST_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); @@ -198,7 +215,7 @@ BOOST_AUTO_UNIT_TEST(simpleCommandNode) senf::console::root().remove("fn"); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_