X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FScopedDirectory.test.cc;h=92e30aa07627576b70eb2fdc023ac906d8bd9366;hb=f13780e9e4da7df981d6f6542fbdc714beb34765;hp=801de49ac357a47995f1de19e3101509a0a9fa8c;hpb=90f51da2398de98c2c217045f791ca7813730f48;p=senf.git diff --git a/senf/Utils/Console/ScopedDirectory.test.cc b/senf/Utils/Console/ScopedDirectory.test.cc index 801de49..92e30aa 100644 --- a/senf/Utils/Console/ScopedDirectory.test.cc +++ b/senf/Utils/Console/ScopedDirectory.test.cc @@ -43,7 +43,7 @@ namespace { senf::console::ScopedDirectory dir; TestObject() : dir(this) { - dir.add("member", &Self::member); + dir.add("member", senf::console::factory::Command(senf::membind(&Self::member,this))); } void member(std::ostream & os, senf::console::ParseCommandInfo const &) { @@ -52,7 +52,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(scopedDirectory) +SENF_AUTO_UNIT_TEST(scopedDirectory) { { TestObject ob; @@ -71,12 +71,14 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(scopedDirectoryVoid) +SENF_AUTO_UNIT_TEST(scopedDirectoryVoid) { + namespace fty = senf::console::factory; + { senf::console::ScopedDirectory<> dir; senf::console::root().add("dir", dir); - dir.add("cb", &callback); + dir.add("cb", fty::Command(&callback)); std::stringstream ss; senf::console::ParseCommandInfo info; senf::console::root()["dir"]("cb")(ss, info); @@ -94,13 +96,15 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(scopedDirectoryBase) +SENF_AUTO_UNIT_TEST(scopedDirectoryBase) { + namespace fty = senf::console::factory; + { senf::console::ScopedDirectory<> dir; senf::console::root().add("dir", dir); dir.mkdir("foo"); - dir.add("cb", &callback); + dir.add("cb", fty::Command(&callback)); BOOST_CHECK( &dir["foo"] == &dir.get("foo") ); BOOST_CHECK( &dir("cb") == &dir.get("cb") );