// $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>
//
-// 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 <g0dil@berlios.de>
/** \file
\brief ScopedDirectory unit tests */
// Custom includes
#include <sstream>
-#include "ScopedDirectory.hh"
+#include "Console.hh"
#include <boost/iterator/transform_iterator.hpp>
#include <senf/Utils/auto_unit_test.hh>
#include <boost/test/test_tools.hpp>
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
namespace {
struct TestObject {
senf::console::ScopedDirectory<Self> dir;
TestObject() : dir(this) {
- dir.add("member", &Self::member);
+ dir.add("member", senf::console::factory::Command(&Self::member, this));
}
void member(std::ostream & os, senf::console::ParseCommandInfo const &) {
};
}
-BOOST_AUTO_UNIT_TEST(scopedDirectory)
+SENF_AUTO_UNIT_TEST(scopedDirectory)
{
{
TestObject ob;
}
}
-BOOST_AUTO_UNIT_TEST(scopedDirectoryVoid)
+SENF_AUTO_UNIT_TEST(scopedDirectoryVoid)
{
+ namespace fty = senf::console::factory;
+
{
senf::console::ScopedDirectory<> dir;
senf::console::root().add("dir", dir);
- dir.add("cb", &callback);
+ dir.add("cb", fty::Command(&callback));
std::stringstream ss;
senf::console::ParseCommandInfo info;
senf::console::root()["dir"]("cb")(ss, info);
};
}
-BOOST_AUTO_UNIT_TEST(scopedDirectoryBase)
+SENF_AUTO_UNIT_TEST(scopedDirectoryBase)
{
+ namespace fty = senf::console::factory;
+
{
senf::console::ScopedDirectory<> dir;
senf::console::root().add("dir", dir);
- dir.mkdir("foo");
- dir.add("cb", &callback);
+ dir.add("foo",fty::Directory());
+ dir.add("cb", fty::Command(&callback));
BOOST_CHECK( &dir["foo"] == &dir.get("foo") );
BOOST_CHECK( &dir("cb") == &dir.get("cb") );
-
+ BOOST_CHECK_EQUAL(dir.name(), "dir");
+
char const * const children[] = { "cb", "foo" };
- BOOST_CHECK_EQUAL_COLLECTIONS(
+ BOOST_CHECK_EQUAL_COLLECTIONS(
boost::make_transform_iterator(dir.children().begin(),
select1st<std::string const &>()),
boost::make_transform_iterator(dir.children().end(),
select1st<std::string const &>()),
- children,
+ children,
children+sizeof(children)/sizeof(children[0]) );
-
+
dir.doc("dir");
std::stringstream ss;
dir.node().help(ss);
}
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f