#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_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);
+ 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(), "invalid directory\n" );
{
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);
+ executor(os, commands.back());
BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinLS );
BOOST_CHECK_EQUAL( os.str(), "invalid directory\n" );
}
{
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" );
}