X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FParse.test.cc;h=46ad9865e05a0626959516800fd1df38c91cd0d7;hb=456ee576285b76aa46240f8001f426757810dcc1;hp=0143b703fa91d8ce921ec568bbb44205683c9fa0;hpb=d620e7ff9b68377ea20ca266c23cc3f05781868c;p=senf.git diff --git a/Console/Parse.test.cc b/Console/Parse.test.cc index 0143b70..46ad986 100644 --- a/Console/Parse.test.cc +++ b/Console/Parse.test.cc @@ -35,7 +35,7 @@ #include "Parse.ih" #include "../Utils/String.hh" -#include +#include "../Utils/auto_unit_test.hh" #include #define prefix_ @@ -43,8 +43,6 @@ namespace { - - struct TestParseDispatcher { TestParseDispatcher(std::ostream & os) : os_ (os) {} @@ -61,7 +59,8 @@ namespace void endCommand() { os_ << "endCommand()\n"; } - void pushArgument(std::string const & argument) + void pushArgument(senf::console::ArgumentToken::TokenType type, + std::string const & argument) { os_ << "pushArgument( " << argument << " )\n"; } void openGroup() { os_ << "openGroup()\n"; } @@ -69,15 +68,18 @@ namespace { os_ << "closeGroup()\n"; } void pushPunctuation(std::string const & token) { os_ << "pushPunctuation( " << token << " )\n"; } - void pushWord(std::string const & token) + void pushWord(senf::console::ArgumentToken::TokenType type, + std::string const & token) { os_ << "pushWord( " << token << " )\n"; } void builtin_cd(std::vector const & path) { os_ << "builtin_cd( " << senf::stringJoin(path, "/") << " )\n"; } void builtin_ls(std::vector const & path) - { os_ << "builtin_cd( " << senf::stringJoin(path, "/") << " )\n"; } + { os_ << "builtin_ls( " << senf::stringJoin(path, "/") << " )\n"; } void builtin_exit() { os_ << "builtin_exit()\n"; } + void builtin_help(std::vector const & path) + { os_ << "builtin_help( " << senf::stringJoin(path, "/") << " )\n"; } }; } @@ -95,10 +97,15 @@ BOOST_AUTO_UNIT_TEST(commandGrammar) "doo / bii / doo arg" " flab::blub" " 123.434>a" - " (a,b,c (huhu))" + " (a,b;c (huhu/{haha}))" " \"foo\\\"bar\" #\n" " x\"01 02 # Inner comment\n" - " 0304\""; + " 0304\";" + "ls /foo/bar;" + "cd /foo/bar;" + "exit;" + "foo/bar/ { ls; }" + "help /foo/bar"; BOOST_CHECK( boost::spirit::parse( text, @@ -113,15 +120,26 @@ BOOST_AUTO_UNIT_TEST(commandGrammar) "pushWord( a )\n" "pushPunctuation( , )\n" "pushWord( b )\n" - "pushPunctuation( , )\n" + "pushPunctuation( ; )\n" "pushWord( c )\n" "pushPunctuation( ( )\n" "pushWord( huhu )\n" + "pushPunctuation( / )\n" + "pushPunctuation( { )\n" + "pushWord( haha )\n" + "pushPunctuation( } )\n" "pushPunctuation( ) )\n" "closeGroup()\n" "pushArgument( foo\"bar )\n" "pushArgument( \x01\x02\x03\x04 )\n" - "endCommand()\n" ); + "endCommand()\n" + "builtin_ls( /foo/bar )\n" + "builtin_cd( /foo/bar )\n" + "builtin_exit()\n" + "pushDirectory( foo/bar/ )\n" + "builtin_ls( )\n" + "popDirectory()\n" + "builtin_help( /foo/bar )\n" ); } namespace { @@ -150,34 +168,83 @@ BOOST_AUTO_UNIT_TEST(commandParser) BOOST_CHECK_EQUAL_COLLECTIONS( info.commandPath().begin(), info.commandPath().end(), path, path + sizeof(path)/sizeof(path[0]) ); - BOOST_REQUIRE_EQUAL( info.arguments().size(), 6u ); - BOOST_REQUIRE_EQUAL( info.tokens().size(), 13u ); + BOOST_CHECK_EQUAL( info.tokens().size(), 15u ); char const * tokens[] = { "arg", "flab::blub", "123.434>a", - "a", ",", "b", ",", "c", "(", "huhu", ")", + "(", "a", ",", "b", ",", "c", "(", "huhu", ")", ")", "foo\"bar", "\x01\x02\x03\x04" }; - BOOST_REQUIRE_EQUAL( info.arguments().begin()[0].size(), 1u ); - BOOST_CHECK_EQUAL( info.arguments().begin()[0].begin()->value(), tokens[0] ); + senf::console::ParseCommandInfo::argument_iterator args (info.arguments().begin()); + BOOST_REQUIRE( args != info.arguments().end() ); + BOOST_REQUIRE_EQUAL( args->size(), 1u ); + BOOST_CHECK_EQUAL( args->begin()->value(), tokens[0] ); - BOOST_REQUIRE_EQUAL( info.arguments().begin()[1].size(), 1u ); - BOOST_CHECK_EQUAL( info.arguments().begin()[1].begin()->value(), tokens[1] ); + ++ args; + BOOST_REQUIRE( args != info.arguments().end() ); + BOOST_REQUIRE_EQUAL( args->size(), 1u ); + BOOST_CHECK_EQUAL( args->begin()->value(), tokens[1] ); + + ++ args; + BOOST_REQUIRE( args != info.arguments().end() ); + BOOST_REQUIRE_EQUAL( args->size(), 1u ); + BOOST_CHECK_EQUAL( args->begin()->value(), tokens[2] ); - BOOST_REQUIRE_EQUAL( info.arguments().begin()[2].size(), 1u ); - BOOST_CHECK_EQUAL( info.arguments().begin()[2].begin()->value(), tokens[2] ); - - BOOST_REQUIRE_EQUAL( info.arguments().begin()[3].size(), 8u ); + ++ args; + BOOST_REQUIRE( args != info.arguments().end() ); + BOOST_REQUIRE_EQUAL( args->size(), 8u ); for (unsigned i (0); i<8; ++i) - BOOST_CHECK_EQUAL( info.arguments().begin()[3].begin()[i].value(), tokens[3+i] ); + BOOST_CHECK_EQUAL( args->begin()[i].value(), tokens[4+i] ); + + ++ args; + BOOST_REQUIRE( args != info.arguments().end() ); + BOOST_REQUIRE_EQUAL( args->size(), 1u ); + BOOST_CHECK_EQUAL( args->begin()->value(), tokens[13] ); + + ++ args; + BOOST_REQUIRE( args != info.arguments().end() ); + BOOST_REQUIRE_EQUAL( args->size(), 1u ); + BOOST_CHECK_EQUAL( args->begin()->value(), tokens[14] ); + + ++ args; + BOOST_CHECK( args == info.arguments().end() ); +} - BOOST_REQUIRE_EQUAL( info.arguments().begin()[4].size(), 1u ); - BOOST_CHECK_EQUAL( info.arguments().begin()[4].begin()->value(), tokens[11] ); +namespace { + void parseArgs(senf::console::ParseCommandInfo::ArgumentsRange const & args) + { + senf::console::CheckedArgumentIteratorWrapper arg (args); + senf::console::ParseCommandInfo::TokensRange arg1 (*(arg++)); + senf::console::ParseCommandInfo::TokensRange arg2 (*(arg++)); + } +} + +BOOST_AUTO_UNIT_TEST(checkedArgumentIterator) +{ + senf::console::CommandParser parser; + + BOOST_CHECK( parser.parse("foo a", &setInfo) ); + BOOST_CHECK_THROW( parseArgs(info.arguments()), senf::console::SyntaxErrorException ); + + BOOST_CHECK( parser.parse("foo a b", &setInfo) ); + BOOST_CHECK_NO_THROW( parseArgs(info.arguments()) ); + + BOOST_CHECK( parser.parse("foo a b c", &setInfo) ); + BOOST_CHECK_THROW( parseArgs(info.arguments()), senf::console::SyntaxErrorException ); + + senf::console::CheckedArgumentIteratorWrapper arg (info.arguments()); + BOOST_CHECK( arg == info.arguments().begin() ); + BOOST_CHECK( arg != info.arguments().end() ); + BOOST_CHECK( arg ); + ++ arg; + BOOST_CHECK( arg ); + arg.clear(); + BOOST_CHECK( arg.done() ); - BOOST_REQUIRE_EQUAL( info.arguments().begin()[5].size(), 1u ); - BOOST_CHECK_EQUAL( info.arguments().begin()[5].begin()->value(), tokens[12] ); + senf::console::ParseCommandInfo::ArgumentIterator i (arg); + BOOST_CHECK( i == info.arguments().end() ); } ///////////////////////////////cc.e////////////////////////////////////////