X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FConsole%2FExecutor.test.cc;h=d4df850b45ed07915c154ce78646f1bfb3ed7211;hb=731a143df4de38d4c8b0a81121990951971cd858;hp=e2ff88a68b3b834d6791045972a862b1095524a3;hpb=958bdb52c39fa39f4ef91cafd9628bcb4f85a03c;p=senf.git diff --git a/Utils/Console/Executor.test.cc b/Utils/Console/Executor.test.cc index e2ff88a..d4df850 100644 --- a/Utils/Console/Executor.test.cc +++ b/Utils/Console/Executor.test.cc @@ -21,7 +21,7 @@ // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /** \file - \brief Executor.test unit tests */ + \brief Executor unit tests */ //#include "Executor.test.hh" //#include "Executor.test.ih" @@ -99,7 +99,10 @@ BOOST_AUTO_UNIT_TEST(executor) parser.parse("ls", &setCommand); executor(os, commands.back()); BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinLS ); - BOOST_CHECK_EQUAL( os.str(), "dir1/\ndir2/\nsys/\n" ); + BOOST_CHECK_EQUAL( os.str(), + "dir1/ \n" + "dir2/ Helptext\n" + "sys/ \n" ); } { @@ -107,7 +110,7 @@ BOOST_AUTO_UNIT_TEST(executor) 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" ); + BOOST_CHECK_EQUAL( os.str(), "dir3/ \n" ); } { @@ -120,6 +123,19 @@ BOOST_AUTO_UNIT_TEST(executor) { std::stringstream os; + parser.parse("lr", &setCommand); + executor(os, commands.back()); + BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinLR ); + BOOST_CHECK_EQUAL( os.str().substr(0,213), + "dir1/ \n" + " dir3/ \n" + "dir2/ Helptext\n" + " test \n" + "sys/ \n" ); + } + + { + std::stringstream os; parser.parse("dir1/dir3 { }", &setCommand); executor(os, commands.rbegin()[1]); BOOST_CHECK_EQUAL( commands.rbegin()[1].builtin(), senf::console::ParseCommandInfo::BuiltinPUSHD ); @@ -213,7 +229,7 @@ BOOST_AUTO_UNIT_TEST(executorPolicy) 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" ); + BOOST_CHECK_EQUAL( os.str(), "dir3/ \n" ); } {