// Custom includes
#include <sstream>
#include <vector>
-#include "Executor.hh"
+#include "Console.hh"
#include <senf/Utils/auto_unit_test.hh>
#include <boost/test/test_tools.hpp>
}
}
-BOOST_AUTO_UNIT_TEST(executor)
+SENF_AUTO_UNIT_TEST(executor)
{
- senf::console::root().mkdir("dir1").mkdir("dir3");
- senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+ namespace fty = senf::console::factory;
+
+ senf::console::root().add("dir1",fty::Directory()).add("dir3",fty::Directory());
+ senf::console::root().add("dir2",fty::Directory()).doc("Helptext").add("test",fty::Command(&testCommand));
senf::console::Executor executor;
senf::console::CommandParser parser;
senf::console::root().remove("dir2");
}
-BOOST_AUTO_UNIT_TEST(executorChroot)
+SENF_AUTO_UNIT_TEST(executorChroot)
{
- senf::console::root().mkdir("dir1").mkdir("dir3");
- senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+ namespace fty = senf::console::factory;
+
+ senf::console::root().add("dir1",fty::Directory()).add("dir3",fty::Directory());
+ senf::console::root().add("dir2",fty::Directory().doc("Helptext"))
+ .add("test", fty::Command(&testCommand));
senf::console::Executor executor;
senf::console::CommandParser parser;
}
}
-BOOST_AUTO_UNIT_TEST(executorPolicy)
+SENF_AUTO_UNIT_TEST(executorPolicy)
{
- senf::console::root().mkdir("dir1").mkdir("dir3");
- senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+ namespace fty = senf::console::factory;
+
+ senf::console::root().add("dir1",fty::Directory()).add("dir3",fty::Directory());
+ senf::console::root().add("dir2",fty::Directory().doc("Helptext"))
+ .add("test",fty::Command(&testCommand));
senf::console::Executor executor;
senf::console::CommandParser parser;
senf::console::root().remove("dir2");
}
-BOOST_AUTO_UNIT_TEST(executorAuto)
+SENF_AUTO_UNIT_TEST(executorAuto)
{
- senf::console::root().mkdir("tdir1").mkdir("dir3");
- senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+ namespace fty = senf::console::factory;
+
+ senf::console::root().add("tdir1",fty::Directory()).add("dir3",fty::Directory());
+ senf::console::root().add("dir2",fty::Directory().doc("Helptext"))
+ .add("test",fty::Command(&testCommand));
senf::console::Executor executor;
executor