// Custom includes
#include <sstream>
-#include "ScopedDirectory.hh"
+#include "Console.hh"
#include <boost/iterator/transform_iterator.hpp>
#include <senf/Utils/auto_unit_test.hh>
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(