X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FParse.test.cc;h=41b809f886543286d1873924d05422efdda8f46c;hb=3a0e403d889f8a16d78d50bbcd7a0f0157b05313;hp=fd15211d9439851416f508a4cbf6b0b6a23db3c2;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/Parse.test.cc b/senf/Utils/Console/Parse.test.cc
index fd15211..41b809f 100644
--- a/senf/Utils/Console/Parse.test.cc
+++ b/senf/Utils/Console/Parse.test.cc
@@ -31,11 +31,11 @@
 
 // Custom includes
 #include <sstream>
-#include "Parse.hh"
+#include "Console.hh"
 #include "Parse.ih"
-#include "../../Utils/String.hh"
+#include <senf/Utils/String.hh>
 
-#include "../../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -77,7 +77,7 @@ namespace
     };
 }
 
-BOOST_AUTO_UNIT_TEST(commandGrammar)
+SENF_AUTO_UNIT_TEST(commandGrammar)
 {
     senf::console::detail::CommandGrammar<TestParseDispatcher>::Context context;
     std::stringstream ss;
@@ -89,7 +89,7 @@ BOOST_AUTO_UNIT_TEST(commandGrammar)
     {
         static char text[] = 
             "# Comment\n"
-            "doo / bii / doo arg"
+            "doo / bii / // doo arg"
             "                flab::blub"
             "                123.434>a"
             "                (a,b;c (huhu/{haha}))"
@@ -128,7 +128,7 @@ BOOST_AUTO_UNIT_TEST(commandGrammar)
     {
         ss.str("");
         BOOST_CHECK( boost::spirit::parse( 
-                         "ls /foo/bar;", 
+                         "ls //foo/bar;", 
                          grammar.use_parser<Grammar::CommandParser>(), 
                          grammar.use_parser<Grammar::SkipParser>() ) . full );
         BOOST_CHECK_EQUAL( ss.str(), "builtin_ls( None('')/Word('foo')/Word('bar') )\n" );
@@ -164,7 +164,7 @@ BOOST_AUTO_UNIT_TEST(commandGrammar)
     {
         ss.str("");
         BOOST_CHECK( boost::spirit::parse( 
-                         "foo/bar/ {", 
+                         "foo/bar// {", 
                          grammar.use_parser<Grammar::CommandParser>(), 
                          grammar.use_parser<Grammar::SkipParser>() ) . full );
         BOOST_CHECK_EQUAL( ss.str(), 
@@ -198,7 +198,7 @@ namespace {
     { commands.push_back(i); }
 }
 
-BOOST_AUTO_UNIT_TEST(commandParser)
+SENF_AUTO_UNIT_TEST(commandParser)
 {
     senf::console::CommandParser parser;
 
@@ -288,7 +288,7 @@ namespace {
     }
 }
 
-BOOST_AUTO_UNIT_TEST(checkedArgumentIterator)
+SENF_AUTO_UNIT_TEST(checkedArgumentIterator)
 {
     senf::console::CommandParser parser;
 
@@ -318,7 +318,7 @@ BOOST_AUTO_UNIT_TEST(checkedArgumentIterator)
     commands.clear();
 }
 
-BOOST_AUTO_UNIT_TEST(parseIncremental)
+SENF_AUTO_UNIT_TEST(parseIncremental)
 {
     senf::console::CommandParser parser;
 
@@ -340,7 +340,7 @@ namespace {
     }
 }
 
-BOOST_AUTO_UNIT_TEST(parseExceptions)
+SENF_AUTO_UNIT_TEST(parseExceptions)
 {
     senf::console::CommandParser parser;
     std::string msg;