X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FProgramOptions.test.cc;h=40065b3f3bfce2e22b008205db2ae1999664d286;hb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;hp=a1861065d0450c640f8542f575571d0ae778154c;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git

diff --git a/senf/Utils/Console/ProgramOptions.test.cc b/senf/Utils/Console/ProgramOptions.test.cc
index a186106..40065b3 100644
--- a/senf/Utils/Console/ProgramOptions.test.cc
+++ b/senf/Utils/Console/ProgramOptions.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>
@@ -33,7 +33,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     std::string val1;
@@ -48,12 +48,14 @@ namespace {
 
 SENF_AUTO_UNIT_TEST(programOptions)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::ScopedDirectory<> root;
     senf::console::root().add("root", root);
 
-    root.mkdir("dir1").add("fun1", &fun1);
-    root.add("fun2", &fun2);
-    root.mkdir("name-with-dashes").add("fun-2", &fun2);
+    root.add("dir1", fty::Directory()).add("fun1", fty::Command(&fun1));
+    root.add("fun2", fty::Command(&fun2));
+    root.add("name-with-dashes", fty::Directory()).add("fun-2", fty::Command(&fun2));
 
     {
         char const * argv[] = { "", "--dir1-fun1=foo","--fun2" };
@@ -87,7 +89,7 @@ SENF_AUTO_UNIT_TEST(programOptions)
         BOOST_CHECK_EQUAL( val1, "" );
         BOOST_CHECK_EQUAL( val2, true );
     }
-    
+
     {
         char const * argv[] = { "", "-ab" };
         senf::console::ProgramOptions opts(sizeof(argv)/sizeof(argv[0]), argv, root);
@@ -134,7 +136,7 @@ SENF_AUTO_UNIT_TEST(programOptions)
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_