X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FScopedDirectory.test.cc;h=ce0a602466d633fe10c137f2310ead878abee04b;hb=4101c2b818ec67e7469ebb44f030eed2185c4ab0;hp=f94ebeb520d03b3a206af982dbee01d9c8c1efe6;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/Console/ScopedDirectory.test.cc b/senf/Utils/Console/ScopedDirectory.test.cc
index f94ebeb..ce0a602 100644
--- a/senf/Utils/Console/ScopedDirectory.test.cc
+++ b/senf/Utils/Console/ScopedDirectory.test.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -28,14 +28,14 @@
 
 // Custom includes
 #include <sstream>
-#include "ScopedDirectory.hh"
+#include "Console.hh"
 #include <boost/iterator/transform_iterator.hpp>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     struct TestObject {
@@ -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,25 +96,28 @@ 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( 
+        BOOST_CHECK_EQUAL_COLLECTIONS(
             boost::make_transform_iterator(dir.children().begin(),
                                            select1st<std::string const &>()),
             boost::make_transform_iterator(dir.children().end(),
                                            select1st<std::string const &>()),
-            children, 
+            children,
             children+sizeof(children)/sizeof(children[0]) );
-        
+
         dir.doc("dir");
         std::stringstream ss;
         dir.node().help(ss);
@@ -120,7 +125,7 @@ BOOST_AUTO_UNIT_TEST(scopedDirectoryBase)
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_