X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FScopedDirectory.test.cc;h=45f70cd8afc36c61372807f2c16310ca41d020a7;hb=76fe5e8b7de8a71aeb6fe9b1d0ea37d5fa51c87a;hp=4a3ce75a7e2d90969da0ff7e613169d6aa6cb82e;hpb=30c1daf8a1c404209210f76a9a54bcfde443603b;p=senf.git diff --git a/Console/ScopedDirectory.test.cc b/Console/ScopedDirectory.test.cc index 4a3ce75..45f70cd 100644 --- a/Console/ScopedDirectory.test.cc +++ b/Console/ScopedDirectory.test.cc @@ -31,7 +31,7 @@ #include "ScopedDirectory.hh" #include -#include +#include "../Utils/auto_unit_test.hh" #include #define prefix_ @@ -46,7 +46,7 @@ namespace { dir.add("member", &Self::member); } - void member(std::ostream & os, senf::console::CommandNode::Arguments const &) { + void member(std::ostream & os, senf::console::ParseCommandInfo const &) { os << "member"; } }; @@ -59,14 +59,14 @@ BOOST_AUTO_UNIT_TEST(scopedDirectory) senf::console::root().add("ob",ob.dir); std::stringstream ss; senf::console::ParseCommandInfo info; - senf::console::root()["ob"]("member")(ss, info.arguments()); + senf::console::root()["ob"]("member")(ss, info); BOOST_CHECK_EQUAL( ss.str(), "member" ); } BOOST_CHECK_THROW( senf::console::root()["ob"], senf::console::UnknownNodeNameException ); } namespace { - void callback(std::ostream & os, senf::console::CommandNode::Arguments const &) { + void callback(std::ostream & os, senf::console::ParseCommandInfo const &) { os << "cb"; } } @@ -79,7 +79,7 @@ BOOST_AUTO_UNIT_TEST(scopedDirectoryVoid) dir.add("cb", &callback); std::stringstream ss; senf::console::ParseCommandInfo info; - senf::console::root()["dir"]("cb")(ss, info.arguments()); + senf::console::root()["dir"]("cb")(ss, info); BOOST_CHECK_EQUAL( ss.str(), "cb" ); } BOOST_CHECK_THROW( senf::console::root()["dir"],