// $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>
//#include "Config.test.ih"
// Custom includes
-#include "Config.hh"
-#include "ScopedDirectory.hh"
-#include "ParsedCommand.hh"
-#include "ConfigFile.hh"
-#include "ProgramOptions.hh"
+#include "Console.hh"
#include <boost/filesystem/operations.hpp>
#include <senf/Utils/auto_unit_test.hh>
public:
TempFile(std::string const & name) : name_ (name), file_ (name_.c_str()) {}
~TempFile() { file_.close(); boost::filesystem::remove(name_); }
-
+
template <class T> TempFile & operator<<(T const & v) { file_ << v; return *this; }
enum Closer { close }; void operator<<(Closer) { file_.close(); }
std::string const & name() { return name_; }
std::string name_;
std::ofstream file_;
};
+
+}
+
+SENF_AUTO_UNIT_TEST(configBundle_empty)
+{
+ TempFile cfg ("test.cfg");
+ cfg << TempFile::close;
+
+ senf::console::ScopedDirectory<> root;
+ root.add("fun2", senf::console::factory::Command(&fun2));
+
+ senf::console::ConfigBundle bundle(root);
+ bundle.add( senf::console::FileConfig(cfg.name()));
+
+ SENF_CHECK_NO_THROW( bundle.parse() );
}
-BOOST_AUTO_UNIT_TEST(configBundle)
+SENF_AUTO_UNIT_TEST(configBundle)
{
+ namespace fty = senf::console::factory;
+
senf::console::ScopedDirectory<> root;
senf::console::root().add("root", root);
senf::console::ScopedDirectory<> chroot;
senf::console::root().add("chroot", chroot);
- root.mkdir("dir1").add("fun1", &fun1);
- root.add("fun2", &fun2);
- chroot.mkdir("dir1").add("fun1", &fun1);
- chroot.add("fun2", &fun2);
+ root.add("dir1", fty::Directory()).add("fun1", fty::Command(&fun1));
+ root.add("fun2", fty::Command(&fun2));
+ chroot.add("dir1", fty::Directory()).add("fun1", fty::Command(&fun1));
+ chroot.add("fun2", fty::Command(&fun2));
TempFile cfg ("test.cfg");
cfg << "dir1/fun1 foo; fun2;" << TempFile::close;
SENF_CHECK_NO_THROW( bundle.parse() );
BOOST_CHECK_EQUAL( val1, "bar" );
BOOST_CHECK_EQUAL( val2, true );
-
+
bundle.chroot( chroot);
SENF_CHECK_NO_THROW( bundle.parse() );
BOOST_CHECK_EQUAL( val1, "bar" );