#include <vector>
#include "Executor.hh"
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
#include <boost/test/test_tools.hpp>
#define prefix_
void setCommand(senf::console::ParseCommandInfo const & cmd) {
commands.push_back(cmd);
}
- void testCommand(std::ostream & os, senf::console::Executor::Arguments) {
+ void testCommand(std::ostream & os, senf::console::ParseCommandInfo const & command) {
os << "testCommand\n";
}
}
{
std::stringstream os;
parser.parse("cd dir1", &setCommand);
- executor(commands.back(), os);
+ executor(os, commands.back());
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinCD );
- BOOST_CHECK( &executor.cwd() == &senf::console::root()["dir1"] );
+ BOOST_CHECK( executor.cwd() == senf::console::root()["dir1"] );
+ BOOST_CHECK_EQUAL( executor.cwdPath(), "/dir1" );
BOOST_CHECK_EQUAL( os.str(), "" );
}
{
std::stringstream os;
parser.parse("cd /dir2", &setCommand);
- executor(commands.back(), os);
+ executor(os, commands.back());
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinCD );
BOOST_CHECK( &executor.cwd() == &senf::console::root()["dir2"] );
BOOST_CHECK_EQUAL( os.str(), "" );
{
std::stringstream os;
parser.parse("cd dir1", &setCommand);
- executor(commands.back(), os);
+ BOOST_CHECK_THROW( executor(os, commands.back()), senf::console::SyntaxErrorException );
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinCD );
BOOST_CHECK( &executor.cwd() == &senf::console::root()["dir2"] );
- BOOST_CHECK_EQUAL( os.str(), "invalid directory\n" );
+ BOOST_CHECK_EQUAL( os.str(), "" );
}
{
std::stringstream os;
parser.parse("cd /", &setCommand);
- executor(commands.back(), os);
+ executor(os, commands.back());
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinCD );
BOOST_CHECK( &executor.cwd() == &senf::console::root() );
BOOST_CHECK_EQUAL( os.str(), "" );
{
std::stringstream os;
parser.parse("ls", &setCommand);
- executor(commands.back(), os);
+ executor(os, commands.back());
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinLS );
BOOST_CHECK_EQUAL( os.str(), "dir1/\ndir2/\n" );
}
{
std::stringstream os;
parser.parse("ls dir1", &setCommand);
- executor(commands.back(), os);
+ executor(os, commands.back());
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinLS );
BOOST_CHECK_EQUAL( os.str(), "dir3/\n" );
}
{
std::stringstream os;
parser.parse("ls dir3", &setCommand);
- executor(commands.back(), os);
+ BOOST_CHECK_THROW( executor(os, commands.back()), senf::console::SyntaxErrorException );
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinLS );
- BOOST_CHECK_EQUAL( os.str(), "invalid directory\n" );
+ BOOST_CHECK_EQUAL( os.str(), "" );
}
{
std::stringstream os;
parser.parse("dir1/dir3 { }", &setCommand);
- executor(commands.rbegin()[1], os);
+ executor(os, commands.rbegin()[1]);
BOOST_CHECK_EQUAL( commands.rbegin()[1].builtin(), senf::console::ParseCommandInfo::BuiltinPUSHD );
BOOST_CHECK( &executor.cwd() == &senf::console::root()["dir1"]["dir3"] );
BOOST_CHECK_EQUAL( os.str(), "" );
{
std::stringstream os;
- executor(commands.back(), os);
+ executor(os, commands.back());
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinPOPD );
BOOST_CHECK( &executor.cwd() == &senf::console::root() );
BOOST_CHECK_EQUAL( os.str(), "" );
std::stringstream os;
parser.parse("exit", &setCommand);
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinEXIT );
- BOOST_CHECK_THROW( executor(commands.back(), os), senf::console::Executor::ExitException );
+ BOOST_CHECK_THROW( executor(os, commands.back()), senf::console::Executor::ExitException );
BOOST_CHECK_EQUAL( os.str(), "" );
}
{
std::stringstream os;
parser.parse("help /dir2", &setCommand);
- executor(commands.back(), os);
+ executor(os, commands.back());
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinHELP );
BOOST_CHECK_EQUAL( os.str(), "senf::console::DirectoryNode at /dir2\n\nHelptext\n" );
}
{
std::stringstream os;
parser.parse("dir2/test", &setCommand);
- executor(commands.back(), os);
+ executor(os, commands.back());
+ BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::NoBuiltin );
+ BOOST_CHECK_EQUAL( os.str(), "testCommand\n" );
+ }
+
+ commands.clear();
+ senf::console::root().remove("dir1");
+ senf::console::root().remove("dir2");
+}
+
+BOOST_AUTO_UNIT_TEST(executorChroot)
+{
+ senf::console::root().mkdir("dir1").mkdir("dir3");
+ senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+
+ senf::console::Executor executor;
+ senf::console::CommandParser parser;
+
+ executor.chroot( senf::console::root()["dir2"] );
+
+ BOOST_CHECK( & executor.chroot() == & senf::console::root()["dir2"] );
+
+ {
+ std::stringstream os;
+ parser.parse("../test", &setCommand);
+ executor(os, commands.back());
+ BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::NoBuiltin );
+ BOOST_CHECK_EQUAL( os.str(), "testCommand\n" );
+ }
+
+ commands.clear();
+ senf::console::root().remove("dir1");
+ senf::console::root().remove("dir2");
+}
+
+namespace {
+
+ void testPolicy(senf::console::DirectoryNode & dir, std::string const & entry)
+ {
+ if (dir == senf::console::root() && entry == "dir2")
+ throw senf::console::Executor::IgnoreCommandException();
+ }
+}
+
+BOOST_AUTO_UNIT_TEST(executorPolicy)
+{
+ senf::console::root().mkdir("dir1").mkdir("dir3");
+ senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+
+ senf::console::Executor executor;
+ senf::console::CommandParser parser;
+
+ executor.policy(&testPolicy);
+
+ {
+ std::stringstream os;
+ parser.parse("ls dir1", &setCommand);
+ executor(os, commands.back());
+ BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinLS );
+ BOOST_CHECK_EQUAL( os.str(), "dir3/\n" );
+ }
+
+ {
+ std::stringstream os;
+ parser.parse("dir2/test", &setCommand);
+ executor(os, commands.back());
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::NoBuiltin );
+ BOOST_CHECK_EQUAL( os.str(), "" );
+ }
+
+ commands.clear();
+ senf::console::root().remove("dir1");
+ senf::console::root().remove("dir2");
+}
+
+BOOST_AUTO_UNIT_TEST(executorAuto)
+{
+ senf::console::root().mkdir("dir1").mkdir("dir3");
+ senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+
+ senf::console::Executor executor;
+ executor
+ .autocomplete(true)
+ .autocd(true);
+ senf::console::CommandParser parser;
+
+ {
+ std::stringstream os;
+ parser.parse("dir2", &setCommand);
+ executor(os, commands.back());
+ BOOST_CHECK_EQUAL( executor.cwdPath(), "/dir2" );
+ BOOST_CHECK_EQUAL( os.str(), "" );
+ }
+
+ {
+ std::stringstream os;
+ parser.parse("t", &setCommand);
+ executor(os, commands.back());
BOOST_CHECK_EQUAL( os.str(), "testCommand\n" );
}
+
commands.clear();
senf::console::root().remove("dir1");