fix for last commit; grmpf.

[senf.git] / senf / Utils / Console / ScopedDirectory.test.cc

diff --git a/senf/Utils/Console/ScopedDirectory.test.cc b/senf/Utils/Console/ScopedDirectory.test.cc
index f94ebeb..6a6ba60 100644 (file)
--- a/senf/Utils/Console/ScopedDirectory.test.cc
+++ b/senf/Utils/Console/ScopedDirectory.test.cc
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <sstream>
-#include "ScopedDirectory.hh"
+#include "Console.hh"
 #include <boost/iterator/transform_iterator.hpp>
 
 #include <senf/Utils/auto_unit_test.hh>
@@ -43,7 +43,7 @@ namespace {
 
         senf::console::ScopedDirectory<Self> dir;
         TestObject() : dir(this) {
-            dir.add("member", &Self::member);
+            dir.add("member", senf::console::factory::Command(&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,15 +96,18 @@ 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("foo",fty::Directory());
+        dir.add("cb", fty::Command(&callback));
         BOOST_CHECK( &dir["foo"] == &dir.get("foo") );
         BOOST_CHECK( &dir("cb") == &dir.get("cb") );
+        BOOST_CHECK_EQUAL(dir.name(), "dir");
         
         char const * const children[] = { "cb", "foo" };
         BOOST_CHECK_EQUAL_COLLECTIONS(