X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FParse.test.cc;h=1ebb7fe8981ecf9bda9aaf1b004517156dd3674c;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=27f169771da4248358c69a2a749f3e2c862a1029;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git diff --git a/senf/Utils/Console/Parse.test.cc b/senf/Utils/Console/Parse.test.cc index 27f1697..1ebb7fe 100644 --- a/senf/Utils/Console/Parse.test.cc +++ b/senf/Utils/Console/Parse.test.cc @@ -2,23 +2,28 @@ // // Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief Parse unit tests */ @@ -39,7 +44,7 @@ #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { @@ -97,7 +102,7 @@ SENF_AUTO_UNIT_TEST(commandGrammar) " x\"01 02 # Inner comment\n" " 0304\";"; - BOOST_CHECK( boost::spirit::parse( + BOOST_CHECK( senf::console::detail::boost_spirit::parse( text, grammar.use_parser(), grammar.use_parser() ) . full ); @@ -127,16 +132,16 @@ SENF_AUTO_UNIT_TEST(commandGrammar) { ss.str(""); - BOOST_CHECK( boost::spirit::parse( - "ls //foo/bar;", + BOOST_CHECK( senf::console::detail::boost_spirit::parse( + "ls //foo/\"bar\";", grammar.use_parser(), grammar.use_parser() ) . full ); - BOOST_CHECK_EQUAL( ss.str(), "builtin_ls( None('')/Word('foo')/Word('bar') )\n" ); + BOOST_CHECK_EQUAL( ss.str(), "builtin_ls( None('')/Word('foo')/BasicString('bar') )\n" ); } { ss.str(""); - BOOST_CHECK( boost::spirit::parse( + BOOST_CHECK( senf::console::detail::boost_spirit::parse( "lr /foo/bar;", grammar.use_parser(), grammar.use_parser() ) . full ); @@ -145,7 +150,7 @@ SENF_AUTO_UNIT_TEST(commandGrammar) { ss.str(""); - BOOST_CHECK( boost::spirit::parse( + BOOST_CHECK( senf::console::detail::boost_spirit::parse( "cd /foo/bar;", grammar.use_parser(), grammar.use_parser() ) . full ); @@ -154,7 +159,7 @@ SENF_AUTO_UNIT_TEST(commandGrammar) { ss.str(""); - BOOST_CHECK( boost::spirit::parse( + BOOST_CHECK( senf::console::detail::boost_spirit::parse( "exit;", grammar.use_parser(), grammar.use_parser() ) . full ); @@ -163,19 +168,19 @@ SENF_AUTO_UNIT_TEST(commandGrammar) { ss.str(""); - BOOST_CHECK( boost::spirit::parse( - "foo/bar// {", + BOOST_CHECK( senf::console::detail::boost_spirit::parse( + "foo/\"bar baz\"// {", grammar.use_parser(), grammar.use_parser() ) . full ); BOOST_CHECK_EQUAL( ss.str(), - "beginCommand( Word('foo')/Word('bar')/None('') )\n" + "beginCommand( Word('foo')/BasicString('bar baz')/None('') )\n" "pushDirectory()\n" "endCommand()\n" ); } { ss.str(""); - BOOST_CHECK( boost::spirit::parse( + BOOST_CHECK( senf::console::detail::boost_spirit::parse( "}", grammar.use_parser(), grammar.use_parser() ) . full ); @@ -184,7 +189,7 @@ SENF_AUTO_UNIT_TEST(commandGrammar) { ss.str(""); - BOOST_CHECK( boost::spirit::parse( + BOOST_CHECK( senf::console::detail::boost_spirit::parse( "help /foo/bar", grammar.use_parser(), grammar.use_parser() ) . full ); @@ -355,13 +360,13 @@ SENF_AUTO_UNIT_TEST(parseExceptions) CheckParseEx( "/foo/bar;\n ()", "path expected\nat :2:3" ); CheckParseEx( "cd /foo/bar foo/bar", "end of statement expected\nat :1:13" ); CheckParseEx( "/foo/bar foo /", "end of statement expected\nat :1:14" ); - CheckParseEx( "cd \"foo\"", "path expected\nat :1:4" ); + CheckParseEx( "cd (foo)", "path expected\nat :1:4" ); CheckParseEx( "/foo/bar \"string", "'\"' expected\nat :1:17" ); CheckParseEx( "/foo/bar x\"hi\"", "'\"' expected\nat :1:12" ); CheckParseEx( "/foo/bar (", "')' expected\nat :1:11" ); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_