X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FOverloadedCommand.test.cc;h=ad68f575eec6d8dc4f82c7a68bbc3add770c69ab;hb=0eaf5340de8c2fbb02b1e0e13a797931e221dff3;hp=ece3da89d3b81362b94d15fc89bc5403e8f6e5c2;hpb=18ebf1e9edb34f1aa8a32173275421a5d54400f7;p=senf.git

diff --git a/Console/OverloadedCommand.test.cc b/Console/OverloadedCommand.test.cc
index ece3da8..ad68f57 100644
--- a/Console/OverloadedCommand.test.cc
+++ b/Console/OverloadedCommand.test.cc
@@ -30,7 +30,7 @@
 #include <sstream>
 #include "OverloadedCommand.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -38,17 +38,17 @@
 
 namespace {
 
-    void fn1(std::ostream &, senf::console::CommandOverload::Arguments const &)
+    void fn1(std::ostream &, senf::console::ParseCommandInfo const &)
     {
         throw senf::console::SyntaxErrorException("fn1 error");
     }
 
-    void fn2(std::ostream &, senf::console::CommandOverload::Arguments const &)
+    void fn2(std::ostream &, senf::console::ParseCommandInfo const &)
     {
         throw senf::console::SyntaxErrorException("fn2 error");
     }
 
-    void fn3(std::ostream & os, senf::console::CommandOverload::Arguments const &)
+    void fn3(std::ostream & os, senf::console::ParseCommandInfo const &)
     {
         os << "fn3\n";
     }
@@ -67,18 +67,33 @@ BOOST_AUTO_UNIT_TEST(overladedCommand)
     {
         senf::console::ParseCommandInfo info;
         std::stringstream ss;
-        BOOST_CHECK_THROW( senf::console::root()("overload")(ss, info.arguments()),
+        BOOST_CHECK_THROW( senf::console::root()("overload")(ss, info),
                            senf::console::SyntaxErrorException );
         
         cmd.add(senf::console::SimpleCommandOverload::create(&fn3)).doc("fn3");
-        BOOST_CHECK_NO_THROW( senf::console::root()("overload")(ss, info.arguments()) );
+        BOOST_CHECK_NO_THROW( senf::console::root()("overload")(ss, info) );
         BOOST_CHECK_EQUAL( ss.str(), "fn3\n" );
     }
     
     {
         std::stringstream ss;
         cmd.help(ss);
-        BOOST_CHECK_EQUAL( ss.str(), "cmd\n\nfn1\n\nfn2\n\nfn3" );
+        BOOST_CHECK_EQUAL( ss.str(), 
+                           "Usage:\n" 
+                           "    1- overload ...\n"
+                           "    2- overload ...\n"
+                           "    3- overload ...\n"
+                           "\n"
+                           "cmd\n"
+                           "\n"
+                           "Variant 1:\n"
+                           "fn1\n"
+                           "\n"
+                           "Variant 2:\n"
+                           "fn2\n"
+                           "\n"
+                           "Variant 3:\n"
+                           "fn3\n" );
     }
 
     cmd.unlink();